From 3c75b863a628adc020062e773d7edf5bac0649fb Mon Sep 17 00:00:00 2001 From: erdgeist <> Date: Sat, 15 Nov 2003 19:03:54 +0000 Subject: UTF-8 autodetection, some gcc warnings --- vchat-config.h | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'vchat-config.h') 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_FROM, CO_STR, "from", "vc-alpha-0.16", NULL, NULL }, - {CF_SERVERHOST, CO_STR, "host", "pulse.flatline.de",NULL, NULL }, - {CF_SERVERPORT, CO_INT, "port", (char *) 2325, (char *)-1, NULL }, - {CF_CIPHERSUITE, CO_STR, "ciphers", "HIGH:MEDIUM", NULL, NULL }, - {CF_CONFIGFILE, CO_STR, "conffile", "~/.vchat/config", NULL, NULL }, - {CF_CERTFILE, CO_STR, "certfile", "~/.vchat/cert", NULL, NULL }, - {CF_KEYFILE, CO_STR, "keyfile", "~/.vchat/key", NULL, NULL }, - {CF_FORMFILE, CO_STR, "formatfile", "~/.vchat/formats", NULL, NULL }, - {CF_LOGFILE, CO_STR, "logfile", "~/.vchat/log", NULL, NULL, }, - {CF_ENCODING, CO_STR, "encoding", NULL, NULL, &encoding }, - {CF_USESSL, CO_INT, "usessl", (char *) 1, (char *)-1, (unsigned char **)&usessl }, - {CF_USECERT, CO_INT, "usecert", (char *) 1, (char *)-1, NULL }, - {CF_USETIME, CO_INT, "usetime", (char *) 1, (char *)-1, (unsigned char **)&usetime }, - {CF_USETOPIC, CO_INT, "usetopicbar",(char *) 1, (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_CHANNEL, CO_INT, "channel", (char *) 0, (char *)-1, NULL }, - {CF_SCROLLBPRIV, CO_INT, "privscrollb",(char *) 2048, (char *)-1, NULL }, - {CF_SCROLLBACK, CO_INT, "scrollback", (char *) 8192, (char *)-1, NULL }, - {CF_SCROLLBPRIVT,CO_INT, "privscrollt",(char *) 0, (char *)-1, NULL }, - {CF_SCROLLBACKT, CO_INT, "scrolltime", (char *) 86400, (char *)-1, NULL }, - {CF_KEEPLOG, CO_INT, "keeplog", (char *) 0, (char *)-1, NULL }, - {CF_NIL, CO_NIL, NULL, NULL, NULL, NULL }, + {CF_NICK, CO_STR, "nick", NULL, NULL, { .pstr = &nick } }, + {CF_FROM, CO_STR, "from", "vc-alpha-0.16", NULL, { NULL } }, + {CF_SERVERHOST, CO_STR, "host", "pulse.flatline.de",NULL, { NULL } }, + {CF_SERVERPORT, CO_INT, "port", (char *) 2325, (char *)-1, { NULL } }, + {CF_CIPHERSUITE, CO_STR, "ciphers", "HIGH:MEDIUM", NULL, { NULL } }, + {CF_CONFIGFILE, CO_STR, "conffile", "~/.vchat/config", NULL, { NULL } }, + {CF_CERTFILE, CO_STR, "certfile", "~/.vchat/cert", NULL, { NULL } }, + {CF_KEYFILE, CO_STR, "keyfile", "~/.vchat/key", NULL, { NULL } }, + {CF_FORMFILE, CO_STR, "formatfile", "~/.vchat/formats", NULL, { NULL } }, + {CF_LOGFILE, CO_STR, "logfile", "~/.vchat/log", NULL, { NULL } }, + {CF_ENCODING, CO_STR, "encoding", NULL, NULL, { .pstr = &encoding }}, + {CF_USESSL, CO_INT, "usessl", (char *) 1, (char *)-1, { .pint = &usessl } }, + {CF_USECERT, CO_INT, "usecert", (char *) 1, (char *)-1, { NULL } }, + {CF_USETIME, CO_INT, "usetime", (char *) 1, (char *)-1, { .pint = &usetime } }, + {CF_USETOPIC, CO_INT, "usetopicbar",(char *) 1, (char *)-1, { NULL } }, + {CF_PRIVHEIGHT, CO_INT, "messages", (char *) 0, (char *)-1, { NULL } }, + {CF_HSCROLL, CO_INT, "hscroll", (char *) 5, (char *)-1, { .pint = &hscroll } }, + {CF_CHANNEL, CO_INT, "channel", (char *) 0, (char *)-1, { NULL } }, + {CF_SCROLLBPRIV, CO_INT, "privscrollb",(char *) 2048, (char *)-1, { NULL } }, + {CF_SCROLLBACK, CO_INT, "scrollback", (char *) 8192, (char *)-1, { NULL } }, + {CF_SCROLLBPRIVT,CO_INT, "privscrollt",(char *) 0, (char *)-1, { NULL } }, + {CF_SCROLLBACKT, CO_INT, "scrolltime", (char *) 86400, (char *)-1, { NULL } }, + {CF_KEEPLOG, CO_INT, "keeplog", (char *) 0, (char *)-1, { NULL } }, + {CF_NIL, CO_NIL, NULL, NULL, NULL, { NULL } }, }; /* -- cgit v1.2.3