1.1 --- a/ucx/properties.c Sun Jul 14 17:11:34 2013 +0200
1.2 +++ b/ucx/properties.c Mon Jul 15 13:53:51 2013 +0200
1.3 @@ -32,9 +32,9 @@
1.4
1.5 #include "properties.h"
1.6
1.7 -UcxPropParser *ucx_prop_new() {
1.8 - UcxPropParser *parser = (UcxPropParser*)malloc(
1.9 - sizeof(UcxPropParser));
1.10 +UcxProperties *ucx_properties_new() {
1.11 + UcxProperties *parser = (UcxProperties*)malloc(
1.12 + sizeof(UcxProperties));
1.13 if(!parser) {
1.14 return NULL;
1.15 }
1.16 @@ -54,20 +54,20 @@
1.17 return parser;
1.18 }
1.19
1.20 -void ucx_prop_free(UcxPropParser *parser) {
1.21 +void ucx_properties_free(UcxProperties *parser) {
1.22 if(parser->tmp) {
1.23 free(parser->tmp);
1.24 }
1.25 free(parser);
1.26 }
1.27
1.28 -void ucx_prop_fill(UcxPropParser *parser, char *buf, size_t len) {
1.29 +void ucx_properties_fill(UcxProperties *parser, char *buf, size_t len) {
1.30 parser->buffer = buf;
1.31 parser->buflen = len;
1.32 parser->pos = 0;
1.33 }
1.34
1.35 -static void parser_tmp_append(UcxPropParser *parser, char *buf, size_t len) {
1.36 +static void parser_tmp_append(UcxProperties *parser, char *buf, size_t len) {
1.37 if(parser->tmpcap - parser->tmplen < len) {
1.38 size_t newcap = parser->tmpcap + len + 64;
1.39 parser->tmp = (char*)realloc(parser->tmp, newcap);
1.40 @@ -77,7 +77,7 @@
1.41 parser->tmplen += len;
1.42 }
1.43
1.44 -int ucx_prop_parse(UcxPropParser *parser, sstr_t *name, sstr_t *value) {
1.45 +int ucx_properties_next(UcxProperties *parser, sstr_t *name, sstr_t *value) {
1.46 if(parser->tmplen > 0) {
1.47 char *buf = parser->buffer + parser->pos;
1.48 size_t len = parser->buflen - parser->pos;
1.49 @@ -98,7 +98,7 @@
1.50 parser->tmpcap = 0;
1.51 parser->tmplen = 0;
1.52 // run parse with the tmp buffer as main buffer
1.53 - int ret = ucx_prop_parse(parser, name, value);
1.54 + int ret = ucx_properties_next(parser, name, value);
1.55
1.56 // restore original buffer
1.57 parser->tmp = parser->buffer;
1.58 @@ -111,7 +111,7 @@
1.59 * we parse again with the original buffer to get a name/value
1.60 * or a new tmp buffer
1.61 */
1.62 - return ret ? ret : ucx_prop_parse(parser, name, value);
1.63 + return ret ? ret : ucx_properties_next(parser, name, value);
1.64 } else {
1.65 parser_tmp_append(parser, buf, len);
1.66 return 0;
1.67 @@ -195,10 +195,10 @@
1.68 return 0;
1.69 }
1.70
1.71 -int ucx_prop_parse2map(UcxPropParser *parser, UcxMap *map) {
1.72 +int ucx_properties2map(UcxProperties *parser, UcxMap *map) {
1.73 sstr_t name;
1.74 sstr_t value;
1.75 - while(ucx_prop_parse(parser, &name, &value)) {
1.76 + while(ucx_properties_next(parser, &name, &value)) {
1.77 name = sstrdup_alloc(map->allocator, name);
1.78 if(!name.ptr) {
1.79 return 1;
1.80 @@ -222,7 +222,7 @@
1.81 }
1.82
1.83 int ucx_properties_load(UcxMap *map, FILE *file) {
1.84 - UcxPropParser *parser = ucx_prop_new();
1.85 + UcxProperties *parser = ucx_properties_new();
1.86 if(!parser || !map || !file) {
1.87 return 1;
1.88 }
1.89 @@ -231,14 +231,14 @@
1.90 size_t r;
1.91 char buf[1024];
1.92 while((r = fread(buf, 1, 1024, file)) != 0) {
1.93 - ucx_prop_fill(parser, buf, r);
1.94 - if(ucx_prop_parse2map(parser, map)) {
1.95 + ucx_properties_fill(parser, buf, r);
1.96 + if(ucx_properties2map(parser, map)) {
1.97 error = 1;
1.98 break;
1.99 }
1.100 }
1.101
1.102 - ucx_prop_free(parser);
1.103 + ucx_properties_free(parser);
1.104 return error;
1.105 }
1.106
