mirror of
https://github.com/irssi/irssi.git
synced 2026-08-20 17:12:51 +02:00
Use g_ascii_str{,n}casecmp for case insensitive comparison with
ascii only strings. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4739 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
7df46597e1
commit
72930e0be3
12 changed files with 35 additions and 35 deletions
|
|
@ -836,24 +836,24 @@ int parse_time_interval(const char *time, int *msecs)
|
|||
return TRUE;
|
||||
}
|
||||
|
||||
if (g_strncasecmp(desc, "days", len) == 0) {
|
||||
if (g_ascii_strncasecmp(desc, "days", len) == 0) {
|
||||
if (number > 24) {
|
||||
/* would overflow */
|
||||
return FALSE;
|
||||
}
|
||||
*msecs += number * 1000*3600*24;
|
||||
} else if (g_strncasecmp(desc, "hours", len) == 0)
|
||||
} else if (g_ascii_strncasecmp(desc, "hours", len) == 0)
|
||||
*msecs += number * 1000*3600;
|
||||
else if (g_strncasecmp(desc, "minutes", len) == 0 ||
|
||||
g_strncasecmp(desc, "mins", len) == 0)
|
||||
else if (g_ascii_strncasecmp(desc, "minutes", len) == 0 ||
|
||||
g_ascii_strncasecmp(desc, "mins", len) == 0)
|
||||
*msecs += number * 1000*60;
|
||||
else if (g_strncasecmp(desc, "seconds", len) == 0 ||
|
||||
g_strncasecmp(desc, "secs", len) == 0)
|
||||
else if (g_ascii_strncasecmp(desc, "seconds", len) == 0 ||
|
||||
g_ascii_strncasecmp(desc, "secs", len) == 0)
|
||||
*msecs += number * 1000;
|
||||
else if (g_strncasecmp(desc, "milliseconds", len) == 0 ||
|
||||
g_strncasecmp(desc, "millisecs", len) == 0 ||
|
||||
g_strncasecmp(desc, "mseconds", len) == 0 ||
|
||||
g_strncasecmp(desc, "msecs", len) == 0)
|
||||
else if (g_ascii_strncasecmp(desc, "milliseconds", len) == 0 ||
|
||||
g_ascii_strncasecmp(desc, "millisecs", len) == 0 ||
|
||||
g_ascii_strncasecmp(desc, "mseconds", len) == 0 ||
|
||||
g_ascii_strncasecmp(desc, "msecs", len) == 0)
|
||||
*msecs += number;
|
||||
else {
|
||||
ret = FALSE;
|
||||
|
|
@ -907,13 +907,13 @@ int parse_size(const char *size, int *bytes)
|
|||
return FALSE;
|
||||
}
|
||||
|
||||
if (g_strncasecmp(desc, "gbytes", len) == 0)
|
||||
if (g_ascii_strncasecmp(desc, "gbytes", len) == 0)
|
||||
*bytes += number * 1024*1024*1024;
|
||||
if (g_strncasecmp(desc, "mbytes", len) == 0)
|
||||
if (g_ascii_strncasecmp(desc, "mbytes", len) == 0)
|
||||
*bytes += number * 1024*1024;
|
||||
if (g_strncasecmp(desc, "kbytes", len) == 0)
|
||||
if (g_ascii_strncasecmp(desc, "kbytes", len) == 0)
|
||||
*bytes += number * 1024;
|
||||
if (g_strncasecmp(desc, "bytes", len) == 0)
|
||||
if (g_ascii_strncasecmp(desc, "bytes", len) == 0)
|
||||
*bytes += number;
|
||||
|
||||
/* skip punctuation */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue