From 5f2f6886c81efe13b9c67dfb11703bbd1c6f8d69 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Thu, 23 Nov 2000 22:59:14 +0000 Subject: [PATCH] more enum fixes git-svn-id: http://svn.irssi.org/repos/irssi/trunk@862 dbcabf3a-b0e7-0310-adc4-f8d773084564 --- src/lib-config/parse.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib-config/parse.c b/src/lib-config/parse.c index 1c468ad8..ff1874bb 100644 --- a/src/lib-config/parse.c +++ b/src/lib-config/parse.c @@ -131,7 +131,7 @@ static void config_parse_warn_missing(CONFIG_REC *rec, CONFIG_NODE *node, static void config_parse_loop(CONFIG_REC *rec, CONFIG_NODE *node, GTokenType expect); -static int config_parse_symbol(CONFIG_REC *rec, CONFIG_NODE *node) +static GTokenType config_parse_symbol(CONFIG_REC *rec, CONFIG_NODE *node) { CONFIG_NODE *newnode; GTokenType last_char; @@ -143,7 +143,7 @@ static int config_parse_symbol(CONFIG_REC *rec, CONFIG_NODE *node) config_parse_get_token(rec->scanner, node); - last_char = node->type == NODE_TYPE_LIST ? ',' : ';'; + last_char = (GTokenType) (node->type == NODE_TYPE_LIST ? ',' : ';'); /* key */ key = NULL; @@ -154,7 +154,7 @@ static int config_parse_symbol(CONFIG_REC *rec, CONFIG_NODE *node) config_parse_get_token(rec->scanner, node); if (rec->scanner->token != '=') { g_free(key); - return '='; + return (GTokenType) '='; } config_parse_get_token(rec->scanner, node); @@ -188,7 +188,7 @@ static int config_parse_symbol(CONFIG_REC *rec, CONFIG_NODE *node) config_parse_get_token(rec->scanner, node); if (rec->scanner->token != '}') - return '}'; + return (GTokenType) '}'; config_parse_warn_missing(rec, node, last_char, FALSE); break; @@ -203,7 +203,7 @@ static int config_parse_symbol(CONFIG_REC *rec, CONFIG_NODE *node) config_parse_get_token(rec->scanner, node); if (rec->scanner->token != ')') - return ')'; + return (GTokenType) ')'; config_parse_warn_missing(rec, node, last_char, FALSE); break;