--- libaitcfg/example/test.c 2012/04/04 13:11:48 1.2 +++ libaitcfg/example/test.c 2012/08/06 14:52:51 1.2.8.1 @@ -44,10 +44,10 @@ int main() printf("size lst=%d tmp=%d %d\n", sizeof lst, sizeof tmp, sizeof(pthread_mutex_t)); cfgInitConfig(&tmp); - printf("tmp: SetAttribute=%d\n", cfg_setAttribute(&tmp, "global", "piuk", "blahz")); - printf("tmp: SetAttribute=%d\n", cfg_setAttribute(&tmp, "bzyt", "00", "99999")); - printf("tmp: SetAttribute=%d\n", cfg_setAttribute(&tmp, "global", "gniah", "tiiiiiii")); - printf("tmp: SetAttribute=%d\n", cfg_setAttribute(&tmp, NULL, "att", "0001122777777")); + printf("tmp: SetAttribute=%d\n", cfg_setAttribute(&tmp, "global", "piuk", "BLAHzdf")); + printf("tmp: SetAttribute=%d\n", cfg_setAttribute(&tmp, "bzyt", "00", "99999 sdfbj")); + printf("tmp: SetAttribute=%d\n", cfg_setAttribute(&tmp, "global", "gniah", "tiiidfsdfsfsiiii")); + printf("tmp: SetAttribute=%d\n", cfg_setAttribute(&tmp, NULL, "att", "0001122777777555")); cfgInitConfig(&lst); printf("SetAttribute=%d\n", cfg_setAttribute(&lst, NULL, "zzz", "ZZZ")); @@ -79,9 +79,12 @@ int main() printf("tmp: SetAttribute=%d\n", cfg_setAttribute(&tmp, "bzyt", "00", "99999")); printf("tmp: SetAttribute=%d\n", cfg_setAttribute(&tmp, "global", "gniah", "tiiiiiii")); printf("tmp: SetAttribute=%d\n", cfg_setAttribute(&tmp, NULL, "att", "0001122777777")); + printf("tmp: SetAttribute=%d\n", cfg_setAttribute(&tmp, "gruh", "shmink", "ohoboho")); #ifndef SKIP_TEST_MERGE - printf("merge=%d\n---------------------------------\n", cfgMergeConfig(&lst, &tmp)); + printf("before_merge ---------------------------------\n"); + cfgWriteConfig(stdout, &lst, 1); + printf("after_merge=%d ---------------------------------\n", cfgMergeConfig(&lst, &tmp)); cfgWriteConfig(stdout, &lst, 1); #else cfgUnloadConfig(&tmp);