version 1.14.4.3, 2014/03/19 17:44:48
|
version 1.14.4.4, 2014/03/19 18:36:08
|
Line 97 cfg_getSection(cfg_root_t * __restrict cfg, const char
|
Line 97 cfg_getSection(cfg_root_t * __restrict cfg, const char
|
return NULL; |
return NULL; |
} else |
} else |
memset(&fav, 0, sizeof fav); |
memset(&fav, 0, sizeof fav); |
|
if (csSec && !*csSec) |
|
csSec = NULL; |
|
|
if (csSec && *csSec) |
if (csSec && *csSec) |
AIT_KEY(&fav.cfg_sec) = crcFletcher16((u_short*) csSec, |
AIT_KEY(&fav.cfg_sec) = crcFletcher16((u_short*) csSec, |
Line 105 cfg_getSection(cfg_root_t * __restrict cfg, const char
|
Line 107 cfg_getSection(cfg_root_t * __restrict cfg, const char
|
av = RB_NFIND(tagRC, cfg, &fav); |
av = RB_NFIND(tagRC, cfg, &fav); |
if (!av) |
if (!av) |
return NULL; |
return NULL; |
if (strcmp(AIT_GET_STR(&av->cfg_sec), csSec)) | if (csSec) { |
return NULL; | if (AIT_ISEMPTY(&av->cfg_sec) || strcmp(AIT_GET_STR(&av->cfg_sec), csSec)) |
| return NULL; |
| } else { |
| if (!AIT_ISEMPTY(&av->cfg_sec)) |
| return NULL; |
| } |
|
|
arr = array_Init(1); |
arr = array_Init(1); |
if (!arr) { |
if (!arr) { |
Line 115 cfg_getSection(cfg_root_t * __restrict cfg, const char
|
Line 122 cfg_getSection(cfg_root_t * __restrict cfg, const char
|
} else |
} else |
array_Push(arr, av, 0); |
array_Push(arr, av, 0); |
|
|
while ((av = RB_NEXT(tagRC, cfg, av)) && av && !AIT_ISEMPTY(&av->cfg_sec) && | while ((av = RB_NEXT(tagRC, cfg, av)) && av) { |
!strcmp(AIT_GET_STR(&av->cfg_sec), csSec)) | if (csSec) { |
| if (AIT_ISEMPTY(&av->cfg_sec) || strcmp(AIT_GET_STR(&av->cfg_sec), csSec)) |
| break; |
| } else { |
| if (!AIT_ISEMPTY(&av->cfg_sec)) |
| break; |
| } |
| |
array_Push(arr, av, 0); |
array_Push(arr, av, 0); |
|
} |
|
|
return arr; |
return arr; |
} |
} |