p
/
json-rpc-shell
1
1
Fork 0
Code Issues 8 Pull Requests Projects 1 Releases 2 Wiki Activity

Cleanup

This commit is contained in:
Přemysl Eric Janouch 2017-02-07 03:28:15 +01:00
parent c03af00e30
commit 989825f7eb
Signed by: p
GPG Key ID: B715679E3A361BE6
1 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
json-rpc-shell.c
View File

@ -1058,28 +1058,6 @@ save_configuration (struct config_item *root, const char *path_hint)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// TODO: consider moving to liberty, degesch has exactly the same function
static struct config_item *
load_configuration_file (const char *filename, struct error **e)
{
struct config_item *root = NULL;
struct str data;
str_init (&data);
if (!read_file (filename, &data, e))
goto end;
struct error *error = NULL;
if (!(root = config_item_parse (data.str, data.len, false, &error)))
{
error_set (e, "parse error: %s", error->message);
error_free (error);
}
end:
str_free (&data);
return root;
}
static void static void
load_configuration (struct app_context *ctx) load_configuration (struct app_context *ctx)
{ {
@ -1089,7 +1067,7 @@ load_configuration (struct app_context *ctx)
return; return;
struct error *e = NULL; struct error *e = NULL;
struct config_item *root = load_configuration_file (filename, &e); struct config_item *root = config_read_from_file (filename, &e);
free (filename); free (filename);
if (e) if (e)