luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-23 16:10:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Type accuracy for result of strlen() in string utilities

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=630983
This commit is contained in:
Andrew Borodin 2010-09-29 21:45:53 +04:00 committed by Philip Withnall
parent 5040de9fc7
commit 7895706c82
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
glib/gstrfuncs.c
View File

@ -703,7 +703,7 @@ g_ascii_strtod (const gchar *nptr,
struct lconv *locale_data; struct lconv *locale_data;
#endif #endif
const char *decimal_point; const char *decimal_point;
int decimal_point_len; gsize decimal_point_len;
const char *p, *decimal_point_pos; const char *p, *decimal_point_pos;
const char *end = NULL; /* Silence gcc */ const char *end = NULL; /* Silence gcc */
int strtod_errno; int strtod_errno;
@ -920,7 +920,7 @@ g_ascii_formatd (gchar *buffer,
struct lconv *locale_data; struct lconv *locale_data;
#endif #endif
const char *decimal_point; const char *decimal_point;
int decimal_point_len; gsize decimal_point_len;
gchar *p; gchar *p;
int rest_len; int rest_len;
gchar format_char; gchar format_char;
@ -1522,9 +1522,9 @@ g_ascii_strdown (const gchar *str,
g_return_val_if_fail (str != NULL, NULL); g_return_val_if_fail (str != NULL, NULL);
if (len < 0) if (len < 0)
len = strlen (str); len = (gssize) strlen (str);
result = g_strndup (str, len); result = g_strndup (str, (gsize) len);
for (s = result; *s; s++) for (s = result; *s; s++)
*s = g_ascii_tolower (*s); *s = g_ascii_tolower (*s);
@ -1552,9 +1552,9 @@ g_ascii_strup (const gchar *str,
g_return_val_if_fail (str != NULL, NULL); g_return_val_if_fail (str != NULL, NULL);
if (len < 0) if (len < 0)
len = strlen (str); len = (gssize) strlen (str);
result = g_strndup (str, len); result = g_strndup (str, (gsize) len);
for (s = result; *s; s++) for (s = result; *s; s++)
*s = g_ascii_toupper (*s); *s = g_ascii_toupper (*s);
@ -2841,8 +2841,8 @@ gboolean
g_str_has_suffix (const gchar *str, g_str_has_suffix (const gchar *str,
const gchar *suffix) const gchar *suffix)
{ {
int str_len; gsize str_len;
int suffix_len; gsize suffix_len;
g_return_val_if_fail (str != NULL, FALSE); g_return_val_if_fail (str != NULL, FALSE);
g_return_val_if_fail (suffix != NULL, FALSE); g_return_val_if_fail (suffix != NULL, FALSE);