glib r7410 - in trunk: . glib

[mitch svn gnome org]

Author: mitch
Date: Thu Aug 28 14:47:56 2008
New Revision: 7410
URL: http://svn.gnome.org/viewvc/glib?rev=7410&view=rev

Log:
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.



Modified:
   trunk/ChangeLog
   trunk/glib/gstrfuncs.c

Modified: trunk/glib/gstrfuncs.c
==============================================================================
--- trunk/glib/gstrfuncs.c	(original)
+++ trunk/glib/gstrfuncs.c	Thu Aug 28 14:47:56 2008
@@ -627,7 +627,7 @@
 
 static guint64
 g_parse_long_long (const gchar  *nptr,
-		   gchar       **endptr,
+		   const gchar **endptr,
 		   guint         base,
 		   gboolean     *negative)
 {
@@ -729,7 +729,7 @@
   /* 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))
     {
@@ -748,10 +748,10 @@
     {
       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;
 }
@@ -792,7 +792,7 @@
   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;
@@ -834,7 +834,7 @@
   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)
     {