Changeset 162 for blossom

Show
Ignore:
Timestamp:
02/25/06 08:29:22 (3 years ago)
Author:
conrad
Message:

bugfix: fix to handle quoted values, fix some return types

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • blossom/trunk/src/libblossom/xini.c

    r68 r162  
    505505  if (xini_cin (c, X_SQUOTE)) quote = X_SQUOTE; 
    506506 
    507   if (!xini_assert_and_pass (parser, quote)) return NULL; 
    508  
    509507  if ((ret = xini_slurp_to (parser, quote, X_NONE)) == NULL) { 
    510508    return NULL; 
    …… 
    536534  char c, * name, * value; 
    537535 
    538   if (!parser->active) return NULL; 
     536  if (!parser->active) return -1; 
    539537 
    540538  name = xini_slurp_to (parser, X_WHITESPACE | X_EQUAL, X_COMMENT | X_NEWLINE); 
    …… 
    544542#endif 
    545543 
    546   if (name == NULL) return NULL; 
     544  if (name == NULL) return -1; 
    547545 
    548546  xini_skip_whitespace (parser); 
    …… 
    597595  char * section; 
    598596 
    599   if (!parser->active) return NULL; 
    600  
    601   if (!xini_assert_and_pass (parser, X_LBRACKET)) return NULL; 
     597  if (!parser->active) return -1; 
     598 
     599  if (!xini_assert_and_pass (parser, X_LBRACKET)) return -1; 
    602600 
    603601  if ((section = xini_slurp_to (parser, X_RBRACKET, 
    …… 
    606604    printf ("xini_parse_section: FAILED\n"); 
    607605#endif 
    608     return NULL; 
     606    return -1; 
    609607  } else if (!xini_assert_and_pass (parser, X_RBRACKET)) { 
    610608#ifdef DEBUG 
    …… 
    612610#endif 
    613611    free (section); 
    614     return NULL; 
     612    return -1; 
    615613  } 
    616614