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

Bump liberty

Browse Source
This commit is contained in:
Přemysl Eric Janouch 2015-12-13 01:40:03 +01:00
parent f1a83abdd8
commit 50c8ef12ac
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
json-rpc-shell.c
View File

@ -44,9 +44,6 @@
#include <langinfo.h> #include <langinfo.h>
#include <locale.h> #include <locale.h>
#include <signal.h>
#include <strings.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <ev.h> #include <ev.h>
@ -68,7 +65,7 @@
// --- Configuration (application-specific) ------------------------------------ // --- Configuration (application-specific) ------------------------------------
static struct config_item g_config_table[] = static struct simple_config_item g_config_table[] =
{ {
{ ATTR_PROMPT, NULL, "Terminal attributes for the prompt" }, { ATTR_PROMPT, NULL, "Terminal attributes for the prompt" },
{ ATTR_RESET, NULL, "String to reset terminal attributes" }, { ATTR_RESET, NULL, "String to reset terminal attributes" },
@ -537,7 +534,7 @@ load_config (struct app_context *ctx)
map.free = free; map.free = free;
struct error *e = NULL; struct error *e = NULL;
if (!read_config_file (&map, &e)) if (!simple_config_update_from_file (&map, &e))
{ {
print_error ("error loading configuration: %s", e->message); print_error ("error loading configuration: %s", e->message);
error_free (e); error_free (e);
@ -2043,7 +2040,7 @@ parse_program_arguments (struct app_context *ctx, int argc, char **argv,
} }
break; break;
case 'w': case 'w':
call_write_default_config (optarg, g_config_table); call_simple_config_write_default (optarg, g_config_table);
exit (EXIT_SUCCESS); exit (EXIT_SUCCESS);
default: default:

2
liberty

@ -1 +1 @@
Subproject commit 99b92fdd6e181aac2bd8fd021cd2718978126f49 Subproject commit 91fca5cb054fc95fe2e7ac090cac2c3a302565ca