nagbalae/dunst
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pack option_parser.c types into structs

Browse Source
This commit is contained in:
Benedikt Heine 2018-09-16 02:58:21 +02:00
parent a661b2bb85
commit a4ebf4f4e6
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/option_parser.c
View File

@ -12,22 +12,22 @@
#include "log.h" #include "log.h"
#include "utils.h" #include "utils.h"
typedef struct _entry_t { struct entry {
char *key; char *key;
char *value; char *value;
} entry_t; };
typedef struct _section_t { struct section {
char *name; char *name;
int entry_count; int entry_count;
entry_t *entries; struct entry *entries;
} section_t; };
static int section_count = 0; static int section_count = 0;
static section_t *sections; static struct section *sections;
static section_t *new_section(const char *name); static struct section *new_section(const char *name);
static section_t *get_section(const char *name); static struct section *get_section(const char *name);
static void add_entry(const char *section_name, const char *key, const char *value); static void add_entry(const char *section_name, const char *key, const char *value);
static const char *get_value(const char *section, const char *key); static const char *get_value(const char *section, const char *key);
static char *clean_value(const char *value); static char *clean_value(const char *value);
@ -40,7 +40,7 @@ static void cmdline_usage_append(const char *key, const char *type, const char *
static int cmdline_find_option(const char *key); static int cmdline_find_option(const char *key);
section_t *new_section(const char *name) struct section *new_section(const char *name)
{ {
for (int i = 0; i < section_count; i++) { for (int i = 0; i < section_count; i++) {
if (!strcmp(name, sections[i].name)) { if (!strcmp(name, sections[i].name)) {
@ -49,7 +49,7 @@ section_t *new_section(const char *name)
} }
section_count++; section_count++;
sections = g_realloc(sections, sizeof(section_t) * section_count); sections = g_realloc(sections, sizeof(struct section) * section_count);
sections[section_count - 1].name = g_strdup(name); sections[section_count - 1].name = g_strdup(name);
sections[section_count - 1].entries = NULL; sections[section_count - 1].entries = NULL;
sections[section_count - 1].entry_count = 0; sections[section_count - 1].entry_count = 0;
@ -70,7 +70,7 @@ void free_ini(void)
section_count = 0; section_count = 0;
} }
section_t *get_section(const char *name) struct section *get_section(const char *name)
{ {
for (int i = 0; i < section_count; i++) { for (int i = 0; i < section_count; i++) {
if (strcmp(sections[i].name, name) == 0) if (strcmp(sections[i].name, name) == 0)
@ -82,20 +82,20 @@ section_t *get_section(const char *name)
void add_entry(const char *section_name, const char *key, const char *value) void add_entry(const char *section_name, const char *key, const char *value)
{ {
section_t *s = get_section(section_name); struct section *s = get_section(section_name);
if (!s) if (!s)
s = new_section(section_name); s = new_section(section_name);
s->entry_count++; s->entry_count++;
int len = s->entry_count; int len = s->entry_count;
s->entries = g_realloc(s->entries, sizeof(entry_t) * len); s->entries = g_realloc(s->entries, sizeof(struct entry) * len);
s->entries[s->entry_count - 1].key = g_strdup(key); s->entries[s->entry_count - 1].key = g_strdup(key);
s->entries[s->entry_count - 1].value = clean_value(value); s->entries[s->entry_count - 1].value = clean_value(value);
} }
const char *get_value(const char *section, const char *key) const char *get_value(const char *section, const char *key)
{ {
section_t *s = get_section(section); struct section *s = get_section(section);
if (!s) { if (!s) {
return NULL; return NULL;
} }