--- libaitcfg/example/test.c 2012/04/03 12:54:49 1.1.2.10 +++ libaitcfg/example/test.c 2013/08/22 15:24:36 1.4 @@ -37,17 +37,18 @@ int main() printf("Str=%s\n", AIT_GET_STR(&v)); AIT_FREE_VAL(&v); - printf("GetAttribute value=%s\n", cfg_getAttribute(&lst, "section1", "attrtest")); + printf("GetAttribute multi-lines value=%s\n", cfg_getAttribute(&lst, "section1", "attrtest")); + printf("GetAttribute multi-lines w/o \\ value=%s\n", cfg_getAttribute(&lst, "section1", "attrtest_1")); cfgUnloadConfig(&lst); printf("0) ---------------------------------\n"); 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")); @@ -59,23 +60,45 @@ int main() printf("UnsetAttribute=%d\n", cfg_unsetAttribute(&lst, "global", "")); printf("UnsetAttribute=%d\n", cfg_unsetAttribute(&lst, NULL, "att")); printf("UnsetAttribute=%d\n", cfg_unsetAttribute(&lst, "global", "attr2")); - printf("tmp: SetAttribute=%d\n", cfg_setAttribute(&lst, "bzyt", "111", "99999")); + printf("SetAttribute=%d\n", cfg_setAttribute(&lst, "bzyt", "111", "99999")); cfgWriteConfig(stdout, &tmp, 0); cfgWriteConfig(stdout, &lst, 1); printf("1) ---------------------------------\n"); - printf("%d\n---------------------------------\n", cfgMergeConfig(&lst, &tmp)); + +#ifndef SKIP_TEST_CONCAT + printf("concat=%d\n---------------------------------\n", cfgConcatConfig(&lst, &tmp)); + cfgWriteConfig(stdout, &lst, 0); + printf("concat=%d\n---------------------------------\n", cfgConcatConfig(&lst, &tmp)); cfgWriteConfig(stdout, &lst, 1); -#if 0 -// printf("%d\n---------------------------------\n", ConcatConfig(&lst, &tmp)); -// WriteConfig(stdout, &lst); - printf("%d\n---------------------------------\n", ConcatConfig(&lst, &tmp)); - WriteConfig(stdout, &lst); +#else + cfgUnloadConfig(&tmp); +#endif - printf("CreateConfig=%d\n", CreateConfig("test4e.cfg", &lst)); - printf("errno=%d error=%s\n", cfg_GetErrno(), cfg_GetError()); + 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, "gruh", "shmink", "ohoboho")); + printf("tmp: SetAttribute=%d\n", cfg_setAttribute(&tmp, "gruh", "shmink", "ohoboho1")); + printf("tmp: SetAttribute=%d\n", cfg_setAttribute(&tmp, "gruh", "shmink", "ohoboho2")); + printf("tmp: SetAttribute=%d\n", cfg_setAttribute(&tmp, "global", "piuk", "blahz1")); + printf("tmp: SetAttribute=%d\n", cfg_setAttribute(&tmp, "global", "piuk", "blahz2")); + +#ifndef SKIP_TEST_MERGE + printf("before_merge ---------------------------------\n"); + cfgWriteConfig(stdout, &lst, 1); + printf("after_merge=%d ---------------------------------\n", cfgMergeConfig(&lst, &tmp)); + cfgWriteConfig(stdout, &lst, 1); +#else + cfgUnloadConfig(&tmp); #endif - cfgUnloadConfig(&lst); + + printf("CreateConfig=%d\n", cfgCreateConfig("test4e.cfg", &lst, 1)); + printf("errno=%d error=%s\n", cfg_GetErrno(), cfg_GetError()); + cfgUnloadConfig(&tmp); + cfgUnloadConfig(&lst); return 0; }