+2008-08-28 Michael Natterer <mitch@imendio.com>
+
+ * glib/gstrfuncs.c (g_parse_long_long): make "endptr" const since
+ it's always a pointer into the const string passed. Remove some
+ casting to (gchar*) in this function.
+
+ (g_ascii_strtoull)
+ (g_ascii_strtoll): cast "endptr" to (const gchar**) here when
+ passing it to above function.
+
2008-08-28 Bastien Nocera <hadess@hadess.net>
Bug 548612 – g_strstr_len() should use memmem when available
static guint64
g_parse_long_long (const gchar *nptr,
- gchar **endptr,
+ const gchar **endptr,
guint base,
gboolean *negative)
{
/* Store in ENDPTR the address of one character
past the last character we converted. */
if (endptr)
- *endptr = (gchar*) s;
+ *endptr = s;
if (G_UNLIKELY (overflow))
{
{
if (save - nptr >= 2 && TOUPPER (save[-1]) == 'X'
&& save[-2] == '0')
- *endptr = (gchar*) &save[-1];
+ *endptr = &save[-1];
else
/* There was no number to convert. */
- *endptr = (gchar*) nptr;
+ *endptr = nptr;
}
return 0;
}
gboolean negative;
guint64 result;
- result = g_parse_long_long (nptr, endptr, base, &negative);
+ result = g_parse_long_long (nptr, (const gchar **) endptr, base, &negative);
/* Return the result of the appropriate sign. */
return negative ? -result : result;
gboolean negative;
guint64 result;
- result = g_parse_long_long (nptr, endptr, base, &negative);
+ result = g_parse_long_long (nptr, (const gchar **) endptr, base, &negative);
if (negative && result > (guint64) G_MININT64)
{