From: Michael Natterer <mitch@imendio.com>
Date: Thu, 28 Aug 2008 14:47:56 +0000 (+0000)
Subject: make "endptr" const since it's always a pointer into the const string
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=13fe35b66da3519714bf8f878daeea027fd6394a;p=dana%2Fcg-glib.git

make "endptr" const since it's always a pointer into the const string

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.


svn path=/trunk/; revision=7410
---

diff --git a/ChangeLog b/ChangeLog
index b00ca1aa..b58ac1e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+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
diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
index 7c5e56d4..b315fb38 100644
--- a/glib/gstrfuncs.c
+++ b/glib/gstrfuncs.c
@@ -627,7 +627,7 @@ g_ascii_formatd (gchar       *buffer,
 
 static guint64
 g_parse_long_long (const gchar  *nptr,
-		   gchar       **endptr,
+		   const gchar **endptr,
 		   guint         base,
 		   gboolean     *negative)
 {
@@ -729,7 +729,7 @@ g_parse_long_long (const gchar  *nptr,
   /* 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 @@ g_parse_long_long (const gchar  *nptr,
     {
       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 @@ g_ascii_strtoull (const gchar *nptr,
   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 @@ g_ascii_strtoll (const gchar *nptr,
   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)
     {