changeset
renamed properties functions
Mon, 15 Jul 2013 13:53:51 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Mon, 15 Jul 2013 13:53:51 +0200
- changeset 110
- 1cf71e56f01e
- parent 109
- 75cb6590358b
- child 111
- c8c59d7f4536
renamed properties functions
| test/main.c | file | annotate | diff | comparison | revisions | |
| test/prop_tests.c | file | annotate | diff | comparison | revisions | |
| test/prop_tests.h | file | annotate | diff | comparison | revisions | |
| ucx/properties.c | file | annotate | diff | comparison | revisions | |
| ucx/properties.h | file | annotate | diff | comparison | revisions |
1.1 --- a/test/main.c Sun Jul 14 17:11:34 2013 +0200 1.2 +++ b/test/main.c Mon Jul 15 13:53:51 2013 +0200 1.3 @@ -171,12 +171,12 @@ 1.4 ucx_test_register(suite, test_ucx_map_rehash); 1.5 1.6 /* UcxPropertiesParser Tests */ 1.7 - ucx_test_register(suite, test_ucx_prop_new); 1.8 - ucx_test_register(suite, test_ucx_prop_parse); 1.9 - ucx_test_register(suite, test_ucx_prop_parse_multi); 1.10 - ucx_test_register(suite, test_ucx_prop_parse_part); 1.11 - ucx_test_register(suite, test_ucx_prop_parse_long); 1.12 - ucx_test_register(suite, test_ucx_prop_parse2map); 1.13 + ucx_test_register(suite, test_ucx_properties_new); 1.14 + ucx_test_register(suite, test_ucx_properties_next); 1.15 + ucx_test_register(suite, test_ucx_properties_next_multi); 1.16 + ucx_test_register(suite, test_ucx_properties_next_part); 1.17 + ucx_test_register(suite, test_ucx_properties_next_long); 1.18 + ucx_test_register(suite, test_ucx_properties2map); 1.19 ucx_test_register(suite, test_ucx_properties_load); 1.20 ucx_test_register(suite, test_ucx_properties_store); 1.21
2.1 --- a/test/prop_tests.c Sun Jul 14 17:11:34 2013 +0200 2.2 +++ b/test/prop_tests.c Mon Jul 15 13:53:51 2013 +0200 2.3 @@ -28,8 +28,8 @@ 2.4 2.5 #include "prop_tests.h" 2.6 2.7 -UCX_TEST_IMPLEMENT(test_ucx_prop_new) { 2.8 - UcxPropParser *parser = ucx_prop_new(); 2.9 +UCX_TEST_IMPLEMENT(test_ucx_properties_new) { 2.10 + UcxProperties *parser = ucx_properties_new(); 2.11 2.12 UCX_TEST_BEGIN 2.13 2.14 @@ -39,10 +39,10 @@ 2.15 2.16 UCX_TEST_END 2.17 2.18 - ucx_prop_free(parser); 2.19 + ucx_properties_free(parser); 2.20 } 2.21 2.22 -UCX_TEST_IMPLEMENT(test_ucx_prop_parse) { 2.23 +UCX_TEST_IMPLEMENT(test_ucx_properties_next) { 2.24 const char *tests[] = { 2.25 "name = value\n", 2.26 "name=value\n", 2.27 @@ -88,32 +88,32 @@ 2.28 sstr_t value; 2.29 2.30 for(int i=0;i<10;i++) { 2.31 - UcxPropParser *parser = ucx_prop_new(); 2.32 + UcxProperties *parser = ucx_properties_new(); 2.33 2.34 - ucx_prop_fill(parser, (char*)tests[i], strlen(tests[i])); 2.35 + ucx_properties_fill(parser, (char*)tests[i], strlen(tests[i])); 2.36 UCX_TEST_ASSERT(parser->buffer == tests[i], "fill failed"); 2.37 UCX_TEST_ASSERT(parser->buflen == strlen(tests[i]), "wrong buflen"); 2.38 2.39 - int r = ucx_prop_parse(parser, &name, &value); 2.40 + int r = ucx_properties_next(parser, &name, &value); 2.41 sstr_t n = sstr((char*)names[i]); 2.42 sstr_t v = sstr((char*)values[i]); 2.43 - UCX_TEST_ASSERT(r == 1, "parse returned 0"); 2.44 + UCX_TEST_ASSERT(r == 1, "next returned 0"); 2.45 UCX_TEST_ASSERT((!sstrcmp(name, n)), "wrong property name"); 2.46 UCX_TEST_ASSERT((!sstrcmp(value, v)), "wrong property value"); 2.47 2.48 - r = ucx_prop_parse(parser, &name, &value); 2.49 - UCX_TEST_ASSERT(r == 0, "parse returned 1"); 2.50 + r = ucx_properties_next(parser, &name, &value); 2.51 + UCX_TEST_ASSERT(r == 0, "next returned 1"); 2.52 UCX_TEST_ASSERT(parser->tmp == NULL, "tmp not NULL"); 2.53 UCX_TEST_ASSERT(parser->tmpcap == 0, "tmpcap not NULL"); 2.54 UCX_TEST_ASSERT(parser->tmplen == 0, "tmplen not NULL"); 2.55 2.56 - ucx_prop_free(parser); 2.57 + ucx_properties_free(parser); 2.58 } 2.59 2.60 UCX_TEST_END 2.61 } 2.62 2.63 -UCX_TEST_IMPLEMENT(test_ucx_prop_parse_multi) { 2.64 +UCX_TEST_IMPLEMENT(test_ucx_properties_next_multi) { 2.65 const char *names[] = { 2.66 "a", 2.67 "b", 2.68 @@ -153,31 +153,31 @@ 2.69 "key2 = value2\n" 2.70 "\n\n\n \n key3=value3\n"; 2.71 2.72 - UcxPropParser *parser = ucx_prop_new(); 2.73 + UcxProperties *parser = ucx_properties_new(); 2.74 2.75 UCX_TEST_BEGIN 2.76 2.77 - ucx_prop_fill(parser, (char*)str, strlen(str)); 2.78 + ucx_properties_fill(parser, (char*)str, strlen(str)); 2.79 2.80 sstr_t name; 2.81 sstr_t value; 2.82 for(int i=0;i<8;i++) { 2.83 - int r = ucx_prop_parse(parser, &name, &value); 2.84 - UCX_TEST_ASSERT(r == 1, "parse returned 0"); 2.85 + int r = ucx_properties_next(parser, &name, &value); 2.86 + UCX_TEST_ASSERT(r == 1, "next returned 0"); 2.87 UCX_TEST_ASSERT((!sstrcmp(name, sstr((char*)names[i]))), "wrong name"); 2.88 UCX_TEST_ASSERT((!sstrcmp(value, sstr((char*)values[i]))), 2.89 "wrong value"); 2.90 } 2.91 - int r = ucx_prop_parse(parser, &name, &value); 2.92 - UCX_TEST_ASSERT(r == 0, "parse returned 1"); 2.93 + int r = ucx_properties_next(parser, &name, &value); 2.94 + UCX_TEST_ASSERT(r == 0, "next returned 1"); 2.95 2.96 UCX_TEST_END 2.97 2.98 - ucx_prop_free(parser); 2.99 + ucx_properties_free(parser); 2.100 } 2.101 2.102 -UCX_TEST_IMPLEMENT(test_ucx_prop_parse_part) { 2.103 - UcxPropParser *parser = ucx_prop_new(); 2.104 +UCX_TEST_IMPLEMENT(test_ucx_properties_next_part) { 2.105 + UcxProperties *parser = ucx_properties_new(); 2.106 const char *str; 2.107 int r; 2.108 sstr_t name; 2.109 @@ -186,108 +186,108 @@ 2.110 UCX_TEST_BEGIN 2.111 2.112 str = ""; 2.113 - ucx_prop_fill(parser, (char*)str, strlen(str)); 2.114 - r = ucx_prop_parse(parser, &name, &value); 2.115 - UCX_TEST_ASSERT(r == 0, "parse returned 1"); 2.116 + ucx_properties_fill(parser, (char*)str, strlen(str)); 2.117 + r = ucx_properties_next(parser, &name, &value); 2.118 + UCX_TEST_ASSERT(r == 0, "next returned 1"); 2.119 2.120 str = " \n"; 2.121 - ucx_prop_fill(parser, (char*)str, strlen(str)); 2.122 - r = ucx_prop_parse(parser, &name, &value); 2.123 - UCX_TEST_ASSERT(r == 0, "parse returned 1"); 2.124 + ucx_properties_fill(parser, (char*)str, strlen(str)); 2.125 + r = ucx_properties_next(parser, &name, &value); 2.126 + UCX_TEST_ASSERT(r == 0, "next returned 1"); 2.127 2.128 str = "name"; 2.129 - ucx_prop_fill(parser, (char*)str, strlen(str)); 2.130 - r = ucx_prop_parse(parser, &name, &value); 2.131 - UCX_TEST_ASSERT(r == 0, "parse returned 1"); 2.132 + ucx_properties_fill(parser, (char*)str, strlen(str)); 2.133 + r = ucx_properties_next(parser, &name, &value); 2.134 + UCX_TEST_ASSERT(r == 0, "next returned 1"); 2.135 2.136 str = " "; 2.137 - ucx_prop_fill(parser, (char*)str, strlen(str)); 2.138 - r = ucx_prop_parse(parser, &name, &value); 2.139 - UCX_TEST_ASSERT(r == 0, "parse returned 1"); 2.140 + ucx_properties_fill(parser, (char*)str, strlen(str)); 2.141 + r = ucx_properties_next(parser, &name, &value); 2.142 + UCX_TEST_ASSERT(r == 0, "next returned 1"); 2.143 2.144 str = "= "; 2.145 - ucx_prop_fill(parser, (char*)str, strlen(str)); 2.146 - r = ucx_prop_parse(parser, &name, &value); 2.147 - UCX_TEST_ASSERT(r == 0, "parse returned 1"); 2.148 + ucx_properties_fill(parser, (char*)str, strlen(str)); 2.149 + r = ucx_properties_next(parser, &name, &value); 2.150 + UCX_TEST_ASSERT(r == 0, "next returned 1"); 2.151 2.152 str = "value"; 2.153 - ucx_prop_fill(parser, (char*)str, strlen(str)); 2.154 - r = ucx_prop_parse(parser, &name, &value); 2.155 - UCX_TEST_ASSERT(r == 0, "parse returned 1"); 2.156 + ucx_properties_fill(parser, (char*)str, strlen(str)); 2.157 + r = ucx_properties_next(parser, &name, &value); 2.158 + UCX_TEST_ASSERT(r == 0, "next returned 1"); 2.159 2.160 str = "\n"; 2.161 - ucx_prop_fill(parser, (char*)str, strlen(str)); 2.162 - r = ucx_prop_parse(parser, &name, &value); 2.163 - UCX_TEST_ASSERT(r == 1, "parse returned 0"); 2.164 + ucx_properties_fill(parser, (char*)str, strlen(str)); 2.165 + r = ucx_properties_next(parser, &name, &value); 2.166 + UCX_TEST_ASSERT(r == 1, "next returned 0"); 2.167 UCX_TEST_ASSERT((!sstrcmp(name, sstr((char*)"name"))), "wrong name"); 2.168 UCX_TEST_ASSERT((!sstrcmp(value, sstr((char*)"value"))), "wrong value"); 2.169 2.170 // second round 2.171 str = "#comment\n"; 2.172 - ucx_prop_fill(parser, (char*)str, strlen(str)); 2.173 - r = ucx_prop_parse(parser, &name, &value); 2.174 - UCX_TEST_ASSERT(r == 0, "parse returned 1"); 2.175 + ucx_properties_fill(parser, (char*)str, strlen(str)); 2.176 + r = ucx_properties_next(parser, &name, &value); 2.177 + UCX_TEST_ASSERT(r == 0, "next returned 1"); 2.178 2.179 str = "#comment\nname = "; 2.180 - ucx_prop_fill(parser, (char*)str, strlen(str)); 2.181 - r = ucx_prop_parse(parser, &name, &value); 2.182 - UCX_TEST_ASSERT(r == 0, "parse returned 1"); 2.183 + ucx_properties_fill(parser, (char*)str, strlen(str)); 2.184 + r = ucx_properties_next(parser, &name, &value); 2.185 + UCX_TEST_ASSERT(r == 0, "next returned 1"); 2.186 2.187 str = "value\na = b\n"; 2.188 - ucx_prop_fill(parser, (char*)str, strlen(str)); 2.189 - r = ucx_prop_parse(parser, &name, &value); 2.190 - UCX_TEST_ASSERT(r == 1, "parse returned 0"); 2.191 + ucx_properties_fill(parser, (char*)str, strlen(str)); 2.192 + r = ucx_properties_next(parser, &name, &value); 2.193 + UCX_TEST_ASSERT(r == 1, "next returned 0"); 2.194 UCX_TEST_ASSERT((!sstrcmp(name, sstr((char*)"name"))), "wrong name"); 2.195 UCX_TEST_ASSERT((!sstrcmp(value, sstr((char*)"value"))), "wrong value"); 2.196 2.197 - r = ucx_prop_parse(parser, &name, &value); 2.198 - UCX_TEST_ASSERT(r == 1, "parse returned 0"); 2.199 + r = ucx_properties_next(parser, &name, &value); 2.200 + UCX_TEST_ASSERT(r == 1, "next returned 0"); 2.201 UCX_TEST_ASSERT((!sstrcmp(name, sstr((char*)"a"))), "wrong name"); 2.202 UCX_TEST_ASSERT((!sstrcmp(value, sstr((char*)"b"))), "wrong value"); 2.203 2.204 str = "# comment\n#\n#\ntests = "; 2.205 - ucx_prop_fill(parser, (char*)str, strlen(str)); 2.206 - r = ucx_prop_parse(parser, &name, &value); 2.207 - UCX_TEST_ASSERT(r == 0, "parse returned 1"); 2.208 + ucx_properties_fill(parser, (char*)str, strlen(str)); 2.209 + r = ucx_properties_next(parser, &name, &value); 2.210 + UCX_TEST_ASSERT(r == 0, "next returned 1"); 2.211 2.212 str = "test1 "; 2.213 - ucx_prop_fill(parser, (char*)str, strlen(str)); 2.214 - r = ucx_prop_parse(parser, &name, &value); 2.215 - UCX_TEST_ASSERT(r == 0, "parse returned 1"); 2.216 + ucx_properties_fill(parser, (char*)str, strlen(str)); 2.217 + r = ucx_properties_next(parser, &name, &value); 2.218 + UCX_TEST_ASSERT(r == 0, "next returned 1"); 2.219 2.220 str = "test2 test3 test4\n"; 2.221 sstr_t testv = sstr((char*)"test1 test2 test3 test4"); 2.222 - ucx_prop_fill(parser, (char*)str, strlen(str)); 2.223 - r = ucx_prop_parse(parser, &name, &value); 2.224 - UCX_TEST_ASSERT(r == 1, "parse returned 0"); 2.225 + ucx_properties_fill(parser, (char*)str, strlen(str)); 2.226 + r = ucx_properties_next(parser, &name, &value); 2.227 + UCX_TEST_ASSERT(r == 1, "next returned 0"); 2.228 UCX_TEST_ASSERT((!sstrcmp(name, sstr((char*)"tests"))), "wrong name"); 2.229 UCX_TEST_ASSERT((!sstrcmp(value, testv)), "wrong value"); 2.230 2.231 - // test if parse finds a name/value after a tmp comment 2.232 + // test if ucx_properties_next finds a name/value after a tmp comment 2.233 str = "# just a comment"; 2.234 - ucx_prop_fill(parser, (char*)str, strlen(str)); 2.235 - r = ucx_prop_parse(parser, &name, &value); 2.236 - UCX_TEST_ASSERT(r == 0, "parse returned 1"); 2.237 + ucx_properties_fill(parser, (char*)str, strlen(str)); 2.238 + r = ucx_properties_next(parser, &name, &value); 2.239 + UCX_TEST_ASSERT(r == 0, "next returned 1"); 2.240 2.241 str = " in 3"; 2.242 - ucx_prop_fill(parser, (char*)str, strlen(str)); 2.243 - r = ucx_prop_parse(parser, &name, &value); 2.244 - UCX_TEST_ASSERT(r == 0, "parse returned 1"); 2.245 + ucx_properties_fill(parser, (char*)str, strlen(str)); 2.246 + r = ucx_properties_next(parser, &name, &value); 2.247 + UCX_TEST_ASSERT(r == 0, "next returned 1"); 2.248 2.249 str = " parts\na = 1\n"; 2.250 - ucx_prop_fill(parser, (char*)str, strlen(str)); 2.251 - r = ucx_prop_parse(parser, &name, &value); 2.252 - UCX_TEST_ASSERT(r == 1, "parse returned 0"); 2.253 + ucx_properties_fill(parser, (char*)str, strlen(str)); 2.254 + r = ucx_properties_next(parser, &name, &value); 2.255 + UCX_TEST_ASSERT(r == 1, "next returned 0"); 2.256 UCX_TEST_ASSERT((!sstrcmp(name, sstr((char*)"a"))), "wrong name"); 2.257 UCX_TEST_ASSERT((!sstrcmp(value, sstr((char*)"1"))), "wrong value"); 2.258 2.259 UCX_TEST_END 2.260 2.261 - ucx_prop_free(parser); 2.262 + ucx_properties_free(parser); 2.263 } 2.264 2.265 -UCX_TEST_IMPLEMENT(test_ucx_prop_parse_long) { 2.266 - UcxPropParser *parser = ucx_prop_new(); 2.267 +UCX_TEST_IMPLEMENT(test_ucx_properties_next_long) { 2.268 + UcxProperties *parser = ucx_properties_new(); 2.269 int r; 2.270 size_t name_len = 512; 2.271 char *long_name = (char*)malloc(name_len); 2.272 @@ -305,75 +305,75 @@ 2.273 sstr_t name; 2.274 sstr_t value; 2.275 2.276 - ucx_prop_fill(parser, long_name, 10); 2.277 - r = ucx_prop_parse(parser, &name, &value); 2.278 - UCX_TEST_ASSERT(r == 0, "parse returned 1"); 2.279 + ucx_properties_fill(parser, long_name, 10); 2.280 + r = ucx_properties_next(parser, &name, &value); 2.281 + UCX_TEST_ASSERT(r == 0, "next returned 1"); 2.282 2.283 - ucx_prop_fill(parser, long_name+10, 202); 2.284 - r = ucx_prop_parse(parser, &name, &value); 2.285 - UCX_TEST_ASSERT(r == 0, "parse returned 1"); 2.286 + ucx_properties_fill(parser, long_name+10, 202); 2.287 + r = ucx_properties_next(parser, &name, &value); 2.288 + UCX_TEST_ASSERT(r == 0, "next returned 1"); 2.289 2.290 - ucx_prop_fill(parser, long_name+212, 200); 2.291 - r = ucx_prop_parse(parser, &name, &value); 2.292 - UCX_TEST_ASSERT(r == 0, "parse returned 1"); 2.293 + ucx_properties_fill(parser, long_name+212, 200); 2.294 + r = ucx_properties_next(parser, &name, &value); 2.295 + UCX_TEST_ASSERT(r == 0, "next returned 1"); 2.296 2.297 - ucx_prop_fill(parser, long_name+412, 100); 2.298 - r = ucx_prop_parse(parser, &name, &value); 2.299 - UCX_TEST_ASSERT(r == 0, "parse returned 1"); 2.300 + ucx_properties_fill(parser, long_name+412, 100); 2.301 + r = ucx_properties_next(parser, &name, &value); 2.302 + UCX_TEST_ASSERT(r == 0, "next returned 1"); 2.303 2.304 const char *str = " = "; 2.305 - ucx_prop_fill(parser, (char*)str, strlen(str)); 2.306 - r = ucx_prop_parse(parser, &name, &value); 2.307 - UCX_TEST_ASSERT(r == 0, "parse returned 1"); 2.308 + ucx_properties_fill(parser, (char*)str, strlen(str)); 2.309 + r = ucx_properties_next(parser, &name, &value); 2.310 + UCX_TEST_ASSERT(r == 0, "next returned 1"); 2.311 2.312 - ucx_prop_fill(parser, long_value, 512); 2.313 - r = ucx_prop_parse(parser, &name, &value); 2.314 - UCX_TEST_ASSERT(r == 0, "parse returned 1"); 2.315 + ucx_properties_fill(parser, long_value, 512); 2.316 + r = ucx_properties_next(parser, &name, &value); 2.317 + UCX_TEST_ASSERT(r == 0, "next returned 1"); 2.318 2.319 - ucx_prop_fill(parser, long_value+512, 1024); 2.320 - r = ucx_prop_parse(parser, &name, &value); 2.321 - UCX_TEST_ASSERT(r == 0, "parse returned 1"); 2.322 + ucx_properties_fill(parser, long_value+512, 1024); 2.323 + r = ucx_properties_next(parser, &name, &value); 2.324 + UCX_TEST_ASSERT(r == 0, "next returned 1"); 2.325 2.326 - ucx_prop_fill(parser, long_value+1536, 512); 2.327 - r = ucx_prop_parse(parser, &name, &value); 2.328 - UCX_TEST_ASSERT(r == 0, "parse returned 1"); 2.329 + ucx_properties_fill(parser, long_value+1536, 512); 2.330 + r = ucx_properties_next(parser, &name, &value); 2.331 + UCX_TEST_ASSERT(r == 0, "next returned 1"); 2.332 2.333 str = "\n#comment\nkey = value\n"; 2.334 - ucx_prop_fill(parser, (char*)str, strlen(str)); 2.335 - r = ucx_prop_parse(parser, &name, &value); 2.336 + ucx_properties_fill(parser, (char*)str, strlen(str)); 2.337 + r = ucx_properties_next(parser, &name, &value); 2.338 sstr_t n = sstrn(long_name, name_len); 2.339 sstr_t v = sstrn(long_value, value_len); 2.340 - UCX_TEST_ASSERT(r == 1, "parse returned 0"); 2.341 + UCX_TEST_ASSERT(r == 1, "next returned 0"); 2.342 UCX_TEST_ASSERT((!sstrcmp(name, n)), "wrong name"); 2.343 UCX_TEST_ASSERT((!sstrcmp(value, v)), "wrong value"); 2.344 2.345 - r = ucx_prop_parse(parser, &name, &value); 2.346 - UCX_TEST_ASSERT(r == 1, "parse returned 0"); 2.347 + r = ucx_properties_next(parser, &name, &value); 2.348 + UCX_TEST_ASSERT(r == 1, "next returned 0"); 2.349 UCX_TEST_ASSERT((!sstrcmp(name, sstr((char*)"key"))), "wrong name"); 2.350 UCX_TEST_ASSERT((!sstrcmp(value, sstr((char*)"value"))), "wrong value"); 2.351 2.352 - r = ucx_prop_parse(parser, &name, &value); 2.353 - UCX_TEST_ASSERT(r == 0, "parse returned 1"); 2.354 + r = ucx_properties_next(parser, &name, &value); 2.355 + UCX_TEST_ASSERT(r == 0, "next returned 1"); 2.356 2.357 UCX_TEST_END 2.358 2.359 free(long_name); 2.360 free(long_value); 2.361 - ucx_prop_free(parser); 2.362 + ucx_properties_free(parser); 2.363 } 2.364 2.365 -UCX_TEST_IMPLEMENT(test_ucx_prop_parse2map) { 2.366 +UCX_TEST_IMPLEMENT(test_ucx_properties2map) { 2.367 UcxMap *map = ucx_map_new(16); 2.368 - UcxPropParser *parser = ucx_prop_new(); 2.369 + UcxProperties *parser = ucx_properties_new(); 2.370 2.371 UCX_TEST_BEGIN 2.372 2.373 const char *str = "key1 = value1\nkey2 = value2\n\n#comment\n\nkey3 = value3\n"; 2.374 - ucx_prop_fill(parser, (char*)str, strlen(str)); 2.375 + ucx_properties_fill(parser, (char*)str, strlen(str)); 2.376 2.377 - int r = ucx_prop_parse2map(parser, map); 2.378 + int r = ucx_properties2map(parser, map); 2.379 2.380 - UCX_TEST_ASSERT(r == 0, "parse2map failed"); 2.381 + UCX_TEST_ASSERT(r == 0, "properties2map failed"); 2.382 UCX_TEST_ASSERT(map->count == 3, "wrong number of properties"); 2.383 2.384 char *v1 = (char*)ucx_map_cstr_get(map, "key1"); 2.385 @@ -396,17 +396,17 @@ 2.386 map = ucx_map_new(16); 2.387 2.388 str = "\n#comment\n"; 2.389 - ucx_prop_fill(parser, (char*)str, strlen(str)); 2.390 + ucx_properties_fill(parser, (char*)str, strlen(str)); 2.391 2.392 - r = ucx_prop_parse2map(parser, map); 2.393 - UCX_TEST_ASSERT(r == 0, "parse2map failed"); 2.394 + r = ucx_properties2map(parser, map); 2.395 + UCX_TEST_ASSERT(r == 0, "properties2map failed"); 2.396 UCX_TEST_ASSERT(map->count == 0, "wrong number of properties"); 2.397 2.398 str = "key1 = value1\nsyntax error line\n"; 2.399 - ucx_prop_fill(parser, (char*)str, strlen(str)); 2.400 + ucx_properties_fill(parser, (char*)str, strlen(str)); 2.401 2.402 - r = ucx_prop_parse2map(parser, map); 2.403 - UCX_TEST_ASSERT(r == 1, "parse2map should return 1"); 2.404 + r = ucx_properties2map(parser, map); 2.405 + UCX_TEST_ASSERT(r == 1, "properties2map should return 1"); 2.406 UCX_TEST_ASSERT(map->count == 1, "wrong number of properties"); 2.407 2.408 char *v = (char*)ucx_map_cstr_get(map, "key1"); 2.409 @@ -414,7 +414,7 @@ 2.410 2.411 UCX_TEST_END 2.412 2.413 - ucx_prop_free(parser); 2.414 + ucx_properties_free(parser); 2.415 } 2.416 2.417 UCX_TEST_IMPLEMENT(test_ucx_properties_load) {
3.1 --- a/test/prop_tests.h Sun Jul 14 17:11:34 2013 +0200 3.2 +++ b/test/prop_tests.h Mon Jul 15 13:53:51 2013 +0200 3.3 @@ -36,12 +36,12 @@ 3.4 extern "C" { 3.5 #endif 3.6 3.7 -UCX_TEST_DECLARE(test_ucx_prop_new); 3.8 -UCX_TEST_DECLARE(test_ucx_prop_parse); 3.9 -UCX_TEST_DECLARE(test_ucx_prop_parse_multi); 3.10 -UCX_TEST_DECLARE(test_ucx_prop_parse_part); 3.11 -UCX_TEST_DECLARE(test_ucx_prop_parse_long); 3.12 -UCX_TEST_DECLARE(test_ucx_prop_parse2map); 3.13 +UCX_TEST_DECLARE(test_ucx_properties_new); 3.14 +UCX_TEST_DECLARE(test_ucx_properties_next); 3.15 +UCX_TEST_DECLARE(test_ucx_properties_next_multi); 3.16 +UCX_TEST_DECLARE(test_ucx_properties_next_part); 3.17 +UCX_TEST_DECLARE(test_ucx_properties_next_long); 3.18 +UCX_TEST_DECLARE(test_ucx_properties2map); 3.19 UCX_TEST_DECLARE(test_ucx_properties_load); 3.20 UCX_TEST_DECLARE(test_ucx_properties_store); 3.21
4.1 --- a/ucx/properties.c Sun Jul 14 17:11:34 2013 +0200 4.2 +++ b/ucx/properties.c Mon Jul 15 13:53:51 2013 +0200 4.3 @@ -32,9 +32,9 @@ 4.4 4.5 #include "properties.h" 4.6 4.7 -UcxPropParser *ucx_prop_new() { 4.8 - UcxPropParser *parser = (UcxPropParser*)malloc( 4.9 - sizeof(UcxPropParser)); 4.10 +UcxProperties *ucx_properties_new() { 4.11 + UcxProperties *parser = (UcxProperties*)malloc( 4.12 + sizeof(UcxProperties)); 4.13 if(!parser) { 4.14 return NULL; 4.15 } 4.16 @@ -54,20 +54,20 @@ 4.17 return parser; 4.18 } 4.19 4.20 -void ucx_prop_free(UcxPropParser *parser) { 4.21 +void ucx_properties_free(UcxProperties *parser) { 4.22 if(parser->tmp) { 4.23 free(parser->tmp); 4.24 } 4.25 free(parser); 4.26 } 4.27 4.28 -void ucx_prop_fill(UcxPropParser *parser, char *buf, size_t len) { 4.29 +void ucx_properties_fill(UcxProperties *parser, char *buf, size_t len) { 4.30 parser->buffer = buf; 4.31 parser->buflen = len; 4.32 parser->pos = 0; 4.33 } 4.34 4.35 -static void parser_tmp_append(UcxPropParser *parser, char *buf, size_t len) { 4.36 +static void parser_tmp_append(UcxProperties *parser, char *buf, size_t len) { 4.37 if(parser->tmpcap - parser->tmplen < len) { 4.38 size_t newcap = parser->tmpcap + len + 64; 4.39 parser->tmp = (char*)realloc(parser->tmp, newcap); 4.40 @@ -77,7 +77,7 @@ 4.41 parser->tmplen += len; 4.42 } 4.43 4.44 -int ucx_prop_parse(UcxPropParser *parser, sstr_t *name, sstr_t *value) { 4.45 +int ucx_properties_next(UcxProperties *parser, sstr_t *name, sstr_t *value) { 4.46 if(parser->tmplen > 0) { 4.47 char *buf = parser->buffer + parser->pos; 4.48 size_t len = parser->buflen - parser->pos; 4.49 @@ -98,7 +98,7 @@ 4.50 parser->tmpcap = 0; 4.51 parser->tmplen = 0; 4.52 // run parse with the tmp buffer as main buffer 4.53 - int ret = ucx_prop_parse(parser, name, value); 4.54 + int ret = ucx_properties_next(parser, name, value); 4.55 4.56 // restore original buffer 4.57 parser->tmp = parser->buffer; 4.58 @@ -111,7 +111,7 @@ 4.59 * we parse again with the original buffer to get a name/value 4.60 * or a new tmp buffer 4.61 */ 4.62 - return ret ? ret : ucx_prop_parse(parser, name, value); 4.63 + return ret ? ret : ucx_properties_next(parser, name, value); 4.64 } else { 4.65 parser_tmp_append(parser, buf, len); 4.66 return 0; 4.67 @@ -195,10 +195,10 @@ 4.68 return 0; 4.69 } 4.70 4.71 -int ucx_prop_parse2map(UcxPropParser *parser, UcxMap *map) { 4.72 +int ucx_properties2map(UcxProperties *parser, UcxMap *map) { 4.73 sstr_t name; 4.74 sstr_t value; 4.75 - while(ucx_prop_parse(parser, &name, &value)) { 4.76 + while(ucx_properties_next(parser, &name, &value)) { 4.77 name = sstrdup_alloc(map->allocator, name); 4.78 if(!name.ptr) { 4.79 return 1; 4.80 @@ -222,7 +222,7 @@ 4.81 } 4.82 4.83 int ucx_properties_load(UcxMap *map, FILE *file) { 4.84 - UcxPropParser *parser = ucx_prop_new(); 4.85 + UcxProperties *parser = ucx_properties_new(); 4.86 if(!parser || !map || !file) { 4.87 return 1; 4.88 } 4.89 @@ -231,14 +231,14 @@ 4.90 size_t r; 4.91 char buf[1024]; 4.92 while((r = fread(buf, 1, 1024, file)) != 0) { 4.93 - ucx_prop_fill(parser, buf, r); 4.94 - if(ucx_prop_parse2map(parser, map)) { 4.95 + ucx_properties_fill(parser, buf, r); 4.96 + if(ucx_properties2map(parser, map)) { 4.97 error = 1; 4.98 break; 4.99 } 4.100 } 4.101 4.102 - ucx_prop_free(parser); 4.103 + ucx_properties_free(parser); 4.104 return error; 4.105 } 4.106
5.1 --- a/ucx/properties.h Sun Jul 14 17:11:34 2013 +0200 5.2 +++ b/ucx/properties.h Mon Jul 15 13:53:51 2013 +0200 5.3 @@ -48,14 +48,14 @@ 5.4 char comment1; 5.5 char comment2; 5.6 char comment3; 5.7 -} UcxPropParser; 5.8 +} UcxProperties; 5.9 5.10 5.11 -UcxPropParser *ucx_prop_new(); 5.12 -void ucx_prop_free(UcxPropParser *parser); 5.13 -void ucx_prop_fill(UcxPropParser *parser, char *buf, size_t len); 5.14 -int ucx_prop_parse(UcxPropParser *parser, sstr_t *name, sstr_t *value); 5.15 -int ucx_prop_parse2map(UcxPropParser *parser, UcxMap *map); 5.16 +UcxProperties *ucx_properties_new(); 5.17 +void ucx_properties_free(UcxProperties *parser); 5.18 +void ucx_properties_fill(UcxProperties *parser, char *buf, size_t len); 5.19 +int ucx_properties_next(UcxProperties *parser, sstr_t *name, sstr_t *value); 5.20 +int ucx_properties2map(UcxProperties *parser, UcxMap *map); 5.21 5.22 int ucx_properties_load(UcxMap *map, FILE *file); 5.23 int ucx_properties_store(UcxMap *map, FILE *file);
