diff options
| author | Dmitri Pal <dpal@redhat.com> | 2010-11-27 22:03:24 -0500 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2010-12-21 11:16:09 -0500 |
| commit | ec246f748f8dcbeefd46125546364ed2aa3100ea (patch) | |
| tree | 299ef0b30b5e286d129e991eaac6491010dd702d /ini/ini_defines.h | |
| parent | 5dadfb4371b8ba694b8d9431cb6789bf6de485c4 (diff) | |
| download | ding-libs-ec246f748f8dcbeefd46125546364ed2aa3100ea.tar.gz ding-libs-ec246f748f8dcbeefd46125546364ed2aa3100ea.tar.xz ding-libs-ec246f748f8dcbeefd46125546364ed2aa3100ea.zip | |
Allow merging values
This patch is the first pass at merging functionality.
It implements merging of values that belong to the same
section. Patch includes:
* Definition of merge flags in doxy format
* Definition of the masks in internal header
* Changes to parser to handle the merging of values.
* Also swithed parser to not use ini_config.h as
I want to switch implementation of the current
interface to new interface at some point.
* New unit test was created.
* New config file for this unit test was added to ini.d
Main code changes are in ini_parse.c
Diffstat (limited to 'ini/ini_defines.h')
| -rw-r--r-- | ini/ini_defines.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ini/ini_defines.h b/ini/ini_defines.h index 1d03835..b861f0e 100644 --- a/ini/ini_defines.h +++ b/ini/ini_defines.h @@ -100,6 +100,11 @@ #define INI_FAMILY_VALIDATION 1 #define INI_FAMILY_GRAMMAR 2 +#define INI_MV1S_MASK 0x000F /* Merge values options mask + * for one section */ +#define INI_MV2S_MASK 0x00F0 /* Merge values options mask + * for two sections. */ +#define INI_MS_MASK 0x0F00 /* Merge section options mask */ /* Different error string functions can be passed as callbacks */ |