diff options
author | Timo Sirainen <cras@irssi.org> | 2002-01-27 20:45:59 +0000 |
---|---|---|
committer | cras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2002-01-27 20:45:59 +0000 |
commit | f4897860b50e2d1cc3b97a00d1f5a2e9e9c04faa (patch) | |
tree | a9d1400865e53ac8e5b68ca37b1cb9d081bd8467 /src/lib-config | |
parent | 820c9d3d8288c8d6dfb3172750bc26adea76f66c (diff) | |
download | irssi-f4897860b50e2d1cc3b97a00d1f5a2e9e9c04faa.zip |
toupper(), tolower(), isspace(), is..etc..() aren't safe with chars in some
systems, use our own is_...() functions now instead.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2348 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/lib-config')
-rw-r--r-- | src/lib-config/get.c | 6 | ||||
-rw-r--r-- | src/lib-config/parse.c | 2 | ||||
-rw-r--r-- | src/lib-config/write.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/lib-config/get.c b/src/lib-config/get.c index 518cab40..124d7101 100644 --- a/src/lib-config/get.c +++ b/src/lib-config/get.c @@ -153,7 +153,7 @@ int config_get_bool(CONFIG_REC *rec, const char *section, const char *key, int d str = config_get_str(rec, section, key, NULL); if (str == NULL) return def; - return toupper(*str) == 'T' || toupper(*str) == 'Y'; + return i_toupper(*str) == 'T' || i_toupper(*str) == 'Y'; } /* Return value of key `value_key' from list item where `key' is `value' */ @@ -224,8 +224,8 @@ int config_node_get_bool(CONFIG_NODE *parent, const char *key, int def) str = config_node_get_str(parent, key, NULL); if (str == NULL) return def; - return toupper(*str) == 'T' || toupper(*str) == 'Y' || - (toupper(*str) == 'O' && toupper(str[1]) == 'N'); + return i_toupper(*str) == 'T' || i_toupper(*str) == 'Y' || + (i_toupper(*str) == 'O' && i_toupper(str[1]) == 'N'); } /* Get the value of keys `key' and `key_value' and put them to diff --git a/src/lib-config/parse.c b/src/lib-config/parse.c index a97c6b09..02eb4255 100644 --- a/src/lib-config/parse.c +++ b/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; diff --git a/src/lib-config/write.c b/src/lib-config/write.c index 446735cd..19447827 100644 --- a/src/lib-config/write.c +++ b/src/lib-config/write.c @@ -77,7 +77,7 @@ static int config_has_specials(const char *text) g_return_val_if_fail(text != NULL, FALSE); while (*text != '\0') { - if (!isalnum((int) *text) && *text != '_') + if (!i_isalnum(*text) && *text != '_') return TRUE; text++; } |