1 files changed, 24 insertions, 24 deletions
diff --git a/vchat-config.h b/vchat-config.h
index beb4579..856b00c 100755
--- a/vchat-config.h
+++ b/vchat-config.h
@@ -29,30 +29,30 @@ extern unsigned int hscroll;
 static volatile configoption configoptions[] = {
 /* config-option   type    name in file  default value       value       localvar  */
-  {CF_NICK,        CO_STR, "nick",       NULL,               NULL,       &nick     },
+  {CF_NICK,        CO_STR, "nick",       NULL,               NULL,       { .pstr = &nick }   },
-  {CF_FROM,        CO_STR, "from",       "vc-alpha-0.16",    NULL,       NULL      },
+  {CF_FROM,        CO_STR, "from",       "vc-alpha-0.16",    NULL,       { NULL }  },
-  {CF_SERVERHOST,  CO_STR, "host",       "pulse.flatline.de",NULL,       NULL      },
+  {CF_SERVERHOST,  CO_STR, "host",       "pulse.flatline.de",NULL,       { NULL }  },
-  {CF_SERVERPORT,  CO_INT, "port",       (char *) 2325,      (char *)-1, NULL      },
+  {CF_SERVERPORT,  CO_INT, "port",       (char *) 2325,      (char *)-1, { NULL }   },
-  {CF_CIPHERSUITE, CO_STR, "ciphers",    "HIGH:MEDIUM",      NULL,       NULL      },
+  {CF_CIPHERSUITE, CO_STR, "ciphers",    "HIGH:MEDIUM",      NULL,       { NULL }  },
-  {CF_CONFIGFILE,  CO_STR, "conffile",   "~/.vchat/config",  NULL,       NULL      },
+  {CF_CONFIGFILE,  CO_STR, "conffile",   "~/.vchat/config",  NULL,       { NULL }  },
-  {CF_CERTFILE,    CO_STR, "certfile",   "~/.vchat/cert",    NULL,       NULL      },
+  {CF_CERTFILE,    CO_STR, "certfile",   "~/.vchat/cert",    NULL,       { NULL }  },
-  {CF_KEYFILE,     CO_STR, "keyfile",    "~/.vchat/key",     NULL,       NULL      },
+  {CF_KEYFILE,     CO_STR, "keyfile",    "~/.vchat/key",     NULL,       { NULL }  },
-  {CF_FORMFILE,    CO_STR, "formatfile", "~/.vchat/formats", NULL,       NULL      },
+  {CF_FORMFILE,    CO_STR, "formatfile", "~/.vchat/formats", NULL,       { NULL }  },
-  {CF_LOGFILE,     CO_STR, "logfile",    "~/.vchat/log",     NULL,       NULL,     },
+  {CF_LOGFILE,     CO_STR, "logfile",    "~/.vchat/log",     NULL,       { NULL }  },
-  {CF_ENCODING,    CO_STR, "encoding",   NULL,               NULL,       &encoding },
+  {CF_ENCODING,    CO_STR, "encoding",   NULL,               NULL,       { .pstr = &encoding }},
-  {CF_USESSL,      CO_INT, "usessl",     (char *) 1,         (char *)-1, (unsigned char **)&usessl   },
+  {CF_USESSL,      CO_INT, "usessl",     (char *) 1,         (char *)-1, { .pint = &usessl }  },
-  {CF_USECERT,     CO_INT, "usecert",    (char *) 1,         (char *)-1, NULL      },
+  {CF_USECERT,     CO_INT, "usecert",    (char *) 1,         (char *)-1, { NULL }  },
-  {CF_USETIME,     CO_INT, "usetime",    (char *) 1,         (char *)-1, (unsigned char **)&usetime  },
+  {CF_USETIME,     CO_INT, "usetime",    (char *) 1,         (char *)-1, { .pint = &usetime } },
-  {CF_USETOPIC,    CO_INT, "usetopicbar",(char *) 1,         (char *)-1, NULL      },
+  {CF_USETOPIC,    CO_INT, "usetopicbar",(char *) 1,         (char *)-1, { NULL }  },
-  {CF_PRIVHEIGHT,  CO_INT, "messages",   (char *) 0,         (char *)-1, NULL      },
+  {CF_PRIVHEIGHT,  CO_INT, "messages",   (char *) 0,         (char *)-1, { NULL }  },
-  {CF_HSCROLL,     CO_INT, "hscroll",    (char *) 5,         (char *)-1, (unsigned char **)&hscroll  },
+  {CF_HSCROLL,     CO_INT, "hscroll",    (char *) 5,         (char *)-1, { .pint = &hscroll } },
-  {CF_CHANNEL,     CO_INT, "channel",    (char *) 0,         (char *)-1, NULL      },
+  {CF_CHANNEL,     CO_INT, "channel",    (char *) 0,         (char *)-1, { NULL }  },
-  {CF_SCROLLBPRIV, CO_INT, "privscrollb",(char *) 2048,      (char *)-1, NULL      },
+  {CF_SCROLLBPRIV, CO_INT, "privscrollb",(char *) 2048,      (char *)-1, { NULL }  },
-  {CF_SCROLLBACK,  CO_INT, "scrollback", (char *) 8192,      (char *)-1, NULL      },
+  {CF_SCROLLBACK,  CO_INT, "scrollback", (char *) 8192,      (char *)-1, { NULL }  },
-  {CF_SCROLLBPRIVT,CO_INT, "privscrollt",(char *) 0,         (char *)-1, NULL      },
+  {CF_SCROLLBPRIVT,CO_INT, "privscrollt",(char *) 0,         (char *)-1, { NULL }  },
-  {CF_SCROLLBACKT, CO_INT, "scrolltime", (char *) 86400,     (char *)-1, NULL      },
+  {CF_SCROLLBACKT, CO_INT, "scrolltime", (char *) 86400,     (char *)-1, { NULL }  },
-  {CF_KEEPLOG,     CO_INT, "keeplog",    (char *) 0,         (char *)-1, NULL      },
+  {CF_KEEPLOG,     CO_INT, "keeplog",    (char *) 0,         (char *)-1, { NULL }  },
-  {CF_NIL,         CO_NIL, NULL,         NULL,               NULL,       NULL      },
+  {CF_NIL,         CO_NIL, NULL,         NULL,               NULL,       { NULL }  },
 };
 /*

diff --git a/vchat-config.h b/vchat-config.h index beb4579..856b00c 100755 --- a/vchat-config.h +++ b/vchat-config.h
@@ -29,30 +29,30 @@ extern unsigned int hscroll;
29		29
30	static volatile configoption configoptions[] = {	30	static volatile configoption configoptions[] = {
31	/* config-option type name in file default value value localvar */	31	/* config-option type name in file default value value localvar */
32	{CF_NICK, CO_STR, "nick", NULL, NULL, &nick },	32	{CF_NICK, CO_STR, "nick", NULL, NULL, { .pstr = &nick } },
33	{CF_FROM, CO_STR, "from", "vc-alpha-0.16", NULL, NULL },	33	{CF_FROM, CO_STR, "from", "vc-alpha-0.16", NULL, { NULL } },
34	{CF_SERVERHOST, CO_STR, "host", "pulse.flatline.de",NULL, NULL },	34	{CF_SERVERHOST, CO_STR, "host", "pulse.flatline.de",NULL, { NULL } },
35	{CF_SERVERPORT, CO_INT, "port", (char ) 2325, (char )-1, NULL },	35	{CF_SERVERPORT, CO_INT, "port", (char ) 2325, (char )-1, { NULL } },
36	{CF_CIPHERSUITE, CO_STR, "ciphers", "HIGH:MEDIUM", NULL, NULL },	36	{CF_CIPHERSUITE, CO_STR, "ciphers", "HIGH:MEDIUM", NULL, { NULL } },
37	{CF_CONFIGFILE, CO_STR, "conffile", "~/.vchat/config", NULL, NULL },	37	{CF_CONFIGFILE, CO_STR, "conffile", "~/.vchat/config", NULL, { NULL } },
38	{CF_CERTFILE, CO_STR, "certfile", "~/.vchat/cert", NULL, NULL },	38	{CF_CERTFILE, CO_STR, "certfile", "~/.vchat/cert", NULL, { NULL } },
39	{CF_KEYFILE, CO_STR, "keyfile", "~/.vchat/key", NULL, NULL },	39	{CF_KEYFILE, CO_STR, "keyfile", "~/.vchat/key", NULL, { NULL } },
40	{CF_FORMFILE, CO_STR, "formatfile", "~/.vchat/formats", NULL, NULL },	40	{CF_FORMFILE, CO_STR, "formatfile", "~/.vchat/formats", NULL, { NULL } },
41	{CF_LOGFILE, CO_STR, "logfile", "~/.vchat/log", NULL, NULL, },	41	{CF_LOGFILE, CO_STR, "logfile", "~/.vchat/log", NULL, { NULL } },
42	{CF_ENCODING, CO_STR, "encoding", NULL, NULL, &encoding },	42	{CF_ENCODING, CO_STR, "encoding", NULL, NULL, { .pstr = &encoding }},
43	{CF_USESSL, CO_INT, "usessl", (char ) 1, (char )-1, (unsigned char **)&usessl },	43	{CF_USESSL, CO_INT, "usessl", (char ) 1, (char )-1, { .pint = &usessl } },
44	{CF_USECERT, CO_INT, "usecert", (char ) 1, (char )-1, NULL },	44	{CF_USECERT, CO_INT, "usecert", (char ) 1, (char )-1, { NULL } },
45	{CF_USETIME, CO_INT, "usetime", (char ) 1, (char )-1, (unsigned char **)&usetime },	45	{CF_USETIME, CO_INT, "usetime", (char ) 1, (char )-1, { .pint = &usetime } },
46	{CF_USETOPIC, CO_INT, "usetopicbar",(char ) 1, (char )-1, NULL },	46	{CF_USETOPIC, CO_INT, "usetopicbar",(char ) 1, (char )-1, { NULL } },
47	{CF_PRIVHEIGHT, CO_INT, "messages", (char ) 0, (char )-1, NULL },	47	{CF_PRIVHEIGHT, CO_INT, "messages", (char ) 0, (char )-1, { NULL } },
48	{CF_HSCROLL, CO_INT, "hscroll", (char ) 5, (char )-1, (unsigned char **)&hscroll },	48	{CF_HSCROLL, CO_INT, "hscroll", (char ) 5, (char )-1, { .pint = &hscroll } },
49	{CF_CHANNEL, CO_INT, "channel", (char ) 0, (char )-1, NULL },	49	{CF_CHANNEL, CO_INT, "channel", (char ) 0, (char )-1, { NULL } },
50	{CF_SCROLLBPRIV, CO_INT, "privscrollb",(char ) 2048, (char )-1, NULL },	50	{CF_SCROLLBPRIV, CO_INT, "privscrollb",(char ) 2048, (char )-1, { NULL } },
51	{CF_SCROLLBACK, CO_INT, "scrollback", (char ) 8192, (char )-1, NULL },	51	{CF_SCROLLBACK, CO_INT, "scrollback", (char ) 8192, (char )-1, { NULL } },
52	{CF_SCROLLBPRIVT,CO_INT, "privscrollt",(char ) 0, (char )-1, NULL },	52	{CF_SCROLLBPRIVT,CO_INT, "privscrollt",(char ) 0, (char )-1, { NULL } },
53	{CF_SCROLLBACKT, CO_INT, "scrolltime", (char ) 86400, (char )-1, NULL },	53	{CF_SCROLLBACKT, CO_INT, "scrolltime", (char ) 86400, (char )-1, { NULL } },
54	{CF_KEEPLOG, CO_INT, "keeplog", (char ) 0, (char )-1, NULL },	54	{CF_KEEPLOG, CO_INT, "keeplog", (char ) 0, (char )-1, { NULL } },
55	{CF_NIL, CO_NIL, NULL, NULL, NULL, NULL },	55	{CF_NIL, CO_NIL, NULL, NULL, NULL, { NULL } },
56	};	56	};
57		57
58	/*	58	/*