comparison th_config.c @ 146:c6c3825376c9

Fix string list parsing and handling in configuration parser.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 02 Nov 2010 22:33:38 +0200
parents 3e221c16b087
children f7b571debd81
comparison
equal deleted inserted replaced
145:d2e3a95c74df 146:c6c3825376c9
424 break; 424 break;
425 } 425 }
426 } else if (c == ',') { 426 } else if (c == ',') {
427 switch (item->type) { 427 switch (item->type) {
428 case ITEM_STRING_LIST: 428 case ITEM_STRING_LIST:
429 c = -1;
430 isStart = TRUE;
429 prevMode = parseMode; 431 prevMode = parseMode;
430 parseMode = PM_STRING; 432 parseMode = PM_NEXT;
433 nextMode = PM_STRING;
431 break; 434 break;
432 } 435 }
433 } else { 436 } else {
434 prevMode = parseMode; 437 prevMode = parseMode;
435 parseMode = PM_NORMAL; 438 parseMode = PM_NORMAL;
478 th_pstrcpy((char **) item->data, tmpStr); 481 th_pstrcpy((char **) item->data, tmpStr);
479 prevMode = parseMode; 482 prevMode = parseMode;
480 parseMode = PM_NORMAL; 483 parseMode = PM_NORMAL;
481 break; 484 break;
482 case ITEM_STRING_LIST: 485 case ITEM_STRING_LIST:
483 // th_cfg_add_to_array(item, th_strdup(tmpStr)); 486 th_llist_append(item->list, th_strdup(tmpStr));
484 prevMode = parseMode; 487 prevMode = parseMode;
485 parseMode = PM_NEXT; 488 parseMode = PM_NEXT;
486 nextMode = PM_ARRAY; 489 nextMode = PM_ARRAY;
487 break; 490 break;
488 } 491 }