Added SILC Thread Queue API

[crypto.git] / apps / irssi / src / lib-config / parse.c

diff --git a/apps/irssi/src/lib-config/parse.c b/apps/irssi/src/lib-config/parse.c
index 883a920b68443760472583c1574403ad32ac86e1..474b007f14ad22af9a26192d8354bbf113b50109 100644 (file)
--- a/apps/irssi/src/lib-config/parse.c
+++ b/apps/irssi/src/lib-config/parse.c
@@ -32,7 +32,7 @@ static unsigned int g_istr_hash(gconstpointer v)
        unsigned int h = 0, g;
 
        while (*s != '\0') {
-               h = (h << 4) + toupper(*s);
+               h = (h << 4) + i_toupper(*s);
                if ((g = h & 0xf0000000UL)) {
                        h = h ^ (g >> 24);
                        h = h ^ g;
@@ -82,11 +82,7 @@ static void config_parse_get_token(GScanner *scanner, CONFIG_NODE *node)
                } else {
                        if (scanner->token == G_TOKEN_INT) {
                                scanner->token = G_TOKEN_STRING;
-#undef g_strdup_printf /* This is free'd by GLib itself */
                                scanner->value.v_string = g_strdup_printf("%lu", scanner->value.v_int);
-#ifdef MEM_DEBUG
-#define g_strdup_printf(a, b...) ig_strdup_printf(__FILE__, __LINE__, a, ##b)
-#endif
                        }
                        break;
                }
@@ -256,6 +252,7 @@ void config_parse_init(CONFIG_REC *rec, const char *name)
 
        rec->scanner = scanner = g_scanner_new(NULL);
        scanner->config->skip_comment_single = FALSE;
+       scanner->config->cset_identifier_first = G_CSET_a_2_z"_0123456789"G_CSET_A_2_Z;
        scanner->config->cset_skip_characters = " \t";
        scanner->config->scan_binary = FALSE;
        scanner->config->scan_octal = FALSE;