summaryrefslogtreecommitdiff
path: root/zyklonb.c
diff options
context:
space:
mode:
authorPřemysl Janouch <p.janouch@gmail.com>2015-08-17 00:04:57 +0200
committerPřemysl Janouch <p.janouch@gmail.com>2015-08-17 00:13:05 +0200
commitabd892cbd7d09086c7c3d45ba6bc53ed95176d3b (patch)
treebab95c3cfa885cb47d4689a6e893edf4c7fe98ed /zyklonb.c
parent4ae95be9db742f67d313d2579cddbc0b00b1bd08 (diff)
downloadxK-abd892cbd7d09086c7c3d45ba6bc53ed95176d3b.tar.gz
xK-abd892cbd7d09086c7c3d45ba6bc53ed95176d3b.tar.xz
xK-abd892cbd7d09086c7c3d45ba6bc53ed95176d3b.zip
Bump liberty
Diffstat (limited to 'zyklonb.c')
-rw-r--r--zyklonb.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/zyklonb.c b/zyklonb.c
index 523973d..13a68e3 100644
--- a/zyklonb.c
+++ b/zyklonb.c
@@ -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);