diff options
| author | Dmitri Pal <dpal@redhat.com> | 2010-12-25 23:29:05 -0500 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2012-04-05 11:20:08 -0700 |
| commit | 6aa1f3b84bc42d98916ec6410d5901c1bd46041d (patch) | |
| tree | df7b6c66809d09e72cb35b2badad2ae8d7d9f836 /ini/ini_fileobj.c | |
| parent | 142396b25e68e254f7bc3478d9467158f0fb0eb7 (diff) | |
| download | ding-libs2-6aa1f3b84bc42d98916ec6410d5901c1bd46041d.tar.gz ding-libs2-6aa1f3b84bc42d98916ec6410d5901c1bd46041d.tar.xz ding-libs2-6aa1f3b84bc42d98916ec6410d5901c1bd46041d.zip | |
New merge flags
Adding "DETECT" merge modes.
These modes would be useable for dry run cases to detect
if there are any potential merge conflicts.
Patch just defines new constans and adds input checks.
Diffstat (limited to 'ini/ini_fileobj.c')
| -rw-r--r-- | ini/ini_fileobj.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ini/ini_fileobj.c b/ini/ini_fileobj.c index 94494f7..7bc599b 100644 --- a/ini/ini_fileobj.c +++ b/ini/ini_fileobj.c @@ -44,7 +44,8 @@ static int valid_collision_flags(uint32_t collision_flags) if ((flag != INI_MV1S_OVERWRITE) && (flag != INI_MV1S_ERROR) && (flag != INI_MV1S_PRESERVE) && - (flag != INI_MV1S_ALLOW)) { + (flag != INI_MV1S_ALLOW) && + (flag != INI_MV1S_DETECT)) { TRACE_ERROR_STRING("Invalid value collision flag",""); return 0; } @@ -53,7 +54,8 @@ static int valid_collision_flags(uint32_t collision_flags) if ((flag != INI_MV2S_OVERWRITE) && (flag != INI_MV2S_ERROR) && (flag != INI_MV2S_PRESERVE) && - (flag != INI_MV2S_ALLOW)) { + (flag != INI_MV2S_ALLOW) && + (flag != INI_MV2S_DETECT)) { TRACE_ERROR_STRING("Invalid value cross-section collision flag",""); return 0; } @@ -63,7 +65,8 @@ static int valid_collision_flags(uint32_t collision_flags) (flag != INI_MS_OVERWRITE) && (flag != INI_MS_ERROR) && (flag != INI_MS_PRESERVE) && - (flag != INI_MS_ALLOW)) { + (flag != INI_MS_ALLOW) && + (flag != INI_MS_DETECT)) { TRACE_ERROR_STRING("Invalid section collision flag",""); return 0; } |