p
/
xK
1
1
Fork 0
Code Issues 1 Pull Requests Releases 10 Wiki Activity

degesch: add config_item_string_from_cstr()

This commit is contained in:
Přemysl Eric Janouch 2015-07-11 03:27:17 +02:00
parent 30252e069d
commit b987b2cc64
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common.c
View File

@ -1137,6 +1137,17 @@ config_item_string (const struct str *s)
return self; return self;
} }
static struct config_item_ *
config_item_string_from_cstr (const char *s)
{
struct str tmp;
str_init (&tmp);
str_append (&tmp, s);
struct config_item_ *self = config_item_string (&tmp);
str_free (&tmp);
return self;
}
static struct config_item_ * static struct config_item_ *
config_item_string_array (const struct str *s) config_item_string_array (const struct str *s)
{ {

14
degesch.c
View File

@ -1639,12 +1639,7 @@ set_config_string
struct config_item_ *item = config_item_get (root, key, NULL); struct config_item_ *item = config_item_get (root, key, NULL);
hard_assert (item); hard_assert (item);
struct str s; struct config_item_ *new_ = config_item_string_from_cstr (value);
str_init (&s);
str_append (&s, value);
struct config_item_ *new_ = config_item_string (&s);
str_free (&s);
struct error *e = NULL; struct error *e = NULL;
if (config_item_set_from (item, new_, &e)) if (config_item_set_from (item, new_, &e))
return true; return true;
@ -8700,12 +8695,7 @@ load_default_aliases (struct app_context *ctx)
for (size_t i = 0; i < N_ELEMENTS (g_default_aliases); i++) for (size_t i = 0; i < N_ELEMENTS (g_default_aliases); i++)
{ {
const char **pair = g_default_aliases[i]; const char **pair = g_default_aliases[i];
str_map_set (aliases, pair[0], config_item_string_from_cstr (pair[1]));
struct str tmp;
str_init (&tmp);
str_append (&tmp, pair[1]);
str_map_set (aliases, pair[0], config_item_string (&tmp));
str_free (&tmp);
} }
} }