planix.org/actube
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

renamed cw_entry into cw_Cfg_entry

Browse Source 
new function cw_cfg_get
This commit is contained in:
7u83 2022-07-31 10:50:37 +02:00
parent a2e8e77468
commit 996446d115
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/cw/cfg.c
View File

@ -6,22 +6,17 @@
#include "cw.h" #include "cw.h"
#include "cfg.h" #include "cfg.h"
struct cfg_entry{
char *key;
char *val;
};
static int cmp(const void *k1,const void*k2){ static int cmp(const void *k1,const void*k2){
struct cfg_entry * e1,*e2; struct cw_Cfg_entry * e1,*e2;
e1=(struct cfg_entry *)k1; e1=(struct cw_Cfg_entry *)k1;
e2=(struct cfg_entry *)k2; e2=(struct cw_Cfg_entry *)k2;
return strcmp(e1->key,e2->key); return strcmp(e1->key,e2->key);
} }
static void del(void *ptr) static void del(void *ptr)
{ {
struct cfg_entry * e; struct cw_Cfg_entry * e;
e=(struct cfg_entry *)ptr; e=(struct cw_Cfg_entry *)ptr;
free(e->key); free(e->key);
free(e->val); free(e->val);
} }
@ -29,12 +24,12 @@ static void del(void *ptr)
cw_Cfg_t * cw_cfg_create() cw_Cfg_t * cw_cfg_create()
{ {
return mavl_create(cmp, del, sizeof(struct cfg_entry)); return mavl_create(cmp, del, sizeof(struct cw_Cfg_entry));
} }
int cw_cfg_set(cw_Cfg_t * cfg,const char *key, const char *val) int cw_cfg_set(cw_Cfg_t * cfg,const char *key, const char *val)
{ {
struct cfg_entry e; struct cw_Cfg_entry e;
int replaced; int replaced;
e.key = cw_strdup(key); e.key = cw_strdup(key);
@ -56,10 +51,20 @@ int cw_cfg_set(cw_Cfg_t * cfg,const char *key, const char *val)
return -1; return -1;
} }
char * cw_cfg_get(cw_Cfg_t * cfg, char *key)
{
struct cw_Cfg_entry e,*r;
e.key = key;
r = mavl_get(cfg,&e);
if (!r)
return NULL;
return r->val;
}
void cw_cfg_dump(cw_Cfg_t *cfg) void cw_cfg_dump(cw_Cfg_t *cfg)
{ {
mavliter_t it; mavliter_t it;
struct cfg_entry *e; struct cw_Cfg_entry *e;
mavliter_init(&it,cfg); mavliter_init(&it,cfg);
mavliter_foreach(&it){ mavliter_foreach(&it){

7
src/cw/cfg.h
View File

@ -13,6 +13,13 @@ void cw_cfg_dump(cw_Cfg_t *cfg);
int cw_cfg_read_from_file(FILE * file, cw_Cfg_t * cfg); int cw_cfg_read_from_file(FILE * file, cw_Cfg_t * cfg);
int cw_cfg_load(const char *filename,cw_Cfg_t * cfg); int cw_cfg_load(const char *filename,cw_Cfg_t * cfg);
struct cw_Cfg_entry{
char *key;
char *val;
};
char * cw_cfg_get(cw_Cfg_t * cfg, char *key);
#endif #endif