summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTimo Sirainen <cras@irssi.org>2000-11-23 22:59:14 +0000
committercras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564>2000-11-23 22:59:14 +0000
commit5f2f6886c81efe13b9c67dfb11703bbd1c6f8d69 (patch)
tree00653f2f953fc151c4d0a71e51a13427771bf57b /src
parent1fd6f8faf6d1be323a4cecac0ebfffab31c9d692 (diff)
downloadirssi-5f2f6886c81efe13b9c67dfb11703bbd1c6f8d69.zip
more enum fixes
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@862 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src')
-rw-r--r--src/lib-config/parse.c10
1 files 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;