comparison: src/server/config/keyfile.c
src/server/config/keyfile.c
- changeset 576
- 5c31cc844c68
- parent 575
- bbca8e94fa67
- child 579
- e10457d74fe1
equal
deleted
inserted
replaced
| 575:bbca8e94fa67 | 576:5c31cc844c68 |
|---|---|
| 47 conf->users_end = NULL; | 47 conf->users_end = NULL; |
| 48 | 48 |
| 49 int r = cfg_parse_basic_file((ConfigParser*)conf, in); | 49 int r = cfg_parse_basic_file((ConfigParser*)conf, in); |
| 50 if(r != 0) { | 50 if(r != 0) { |
| 51 fclose(in); | 51 fclose(in); |
| 52 cxMempoolDestroy(conf->parser.mp); | |
| 53 free(conf->file); | |
| 52 free(conf); | 54 free(conf); |
| 53 // TODO: free | 55 // TODO: free |
| 54 return NULL; | 56 return NULL; |
| 55 } | 57 } |
| 56 | 58 |
| 58 | 60 |
| 59 return conf; | 61 return conf; |
| 60 } | 62 } |
| 61 | 63 |
| 62 void free_keyfile_config(KeyfileConfig *conf) { | 64 void free_keyfile_config(KeyfileConfig *conf) { |
| 63 /* | 65 cxMempoolDestroy(conf->parser.mp); |
| 64 if(conf->users) { | |
| 65 ucx_list_free_a(conf->parser.mp, conf->users); | |
| 66 } | |
| 67 ucx_mempool_destroy(conf->parser.mp->pool); | |
| 68 */ | |
| 69 free(conf->file); | 66 free(conf->file); |
| 70 free(conf); | 67 free(conf); |
| 71 } | 68 } |
| 72 | 69 |
| 73 int keyfile_parse(void *p, ConfigLine *begin, ConfigLine *end, cxmutstr line) { | 70 int keyfile_parse(void *p, ConfigLine *begin, ConfigLine *end, cxmutstr line) { |
| 74 KeyfileConfig *conf = p; | 71 KeyfileConfig *conf = p; |
| 75 CxAllocator *mp = conf->parser.mp; | 72 CxAllocator *mp = conf->parser.a; |
| 76 | 73 |
| 77 cxstring *tk = NULL; | 74 cxstring *tk = NULL; |
| 78 ssize_t tkn = cx_strsplit_a(mp, cx_strcast(line), cx_strn(";", 1), KEYFILE_MAX_TOKENS, &tk); | 75 ssize_t tkn = cx_strsplit_a(mp, cx_strcast(line), cx_strn(";", 1), KEYFILE_MAX_TOKENS, &tk); |
| 79 | 76 |
| 80 if(tkn < 2) { | 77 if(tkn < 2) { |
