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

Bump liberty

Browse Source
This commit is contained in:
Přemysl Eric Janouch
2015-08-17 00:04:57 +02:00
parent 4ae95be9db
commit abd892cbd7
4 changed files with 9 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zyklonb.c
View File

@@ -24,7 +24,7 @@
// --- Configuration (application-specific) ------------------------------------
static struct config_item g_config_table[] =
static struct simple_config_item g_config_table[] =
{
{ "nickname", "ZyklonB", "IRC nickname" },
{ "username", "bot", "IRC user name" },
@@ -153,7 +153,7 @@ bot_context_init (struct bot_context *self)
{
str_map_init (&self->config);
self->config.free = free;
load_config_defaults (&self->config, g_config_table);
simple_config_load_defaults (&self->config, g_config_table);
self->admin_re = NULL;
self->irc_fd = -1;
@@ -1965,7 +1965,7 @@ main (int argc, char *argv[])
printf (PROGRAM_NAME " " PROGRAM_VERSION "\n");
exit (EXIT_SUCCESS);
case 'w':
call_write_default_config (optarg, g_config_table);
call_simple_config_write_default (optarg, g_config_table);
exit (EXIT_SUCCESS);
default:
print_error ("wrong options");
@@ -1988,7 +1988,7 @@ main (int argc, char *argv[])
bot_context_init (&ctx);
struct error *e = NULL;
if (!read_config_file (&ctx.config, &e)
if (!simple_config_update_from_file (&ctx.config, &e)
|| !setup_recovery_handler (&ctx, &e))
{
print_error ("%s", e->message);