make static

2000-12-13  Havoc Pennington  <hp@redhat.com>

	* gconvert.c (open_converter): make static

	* gutf8.c (g_utf8_validate): Simplify logic a bit, maybe
	speeding it up - now we just return FALSE if we had to bail out
	for any reason before getting to the end of the string, as defined
	by a nul byte if len was -1, defined by the len otherwise. This
	also fixes a bug where nul bytes were not treated as invalid
	when the length was specified.

ChangeLog

@@ -1,3 +1,14 @@
+2000-12-13  Havoc Pennington  <hp@redhat.com>
+
+	* gconvert.c (open_converter): make static
+
+	* gutf8.c (g_utf8_validate): Simplify logic a bit, maybe 
+	speeding it up - now we just return FALSE if we had to bail out
+	for any reason before getting to the end of the string, as defined 
+	by a nul byte if len was -1, defined by the len otherwise. This 
+	also fixes a bug where nul bytes were not treated as invalid 
+	when the length was specified.
+
 2000-12-12  Havoc Pennington  <hp@pobox.com>
 
 	* gmain.c (g_main_context_destroy): don't try to use thread stuff

ChangeLog.pre-2-0

@@ -1,3 +1,14 @@
+2000-12-13  Havoc Pennington  <hp@redhat.com>
+
+	* gconvert.c (open_converter): make static
+
+	* gutf8.c (g_utf8_validate): Simplify logic a bit, maybe 
+	speeding it up - now we just return FALSE if we had to bail out
+	for any reason before getting to the end of the string, as defined 
+	by a nul byte if len was -1, defined by the len otherwise. This 
+	also fixes a bug where nul bytes were not treated as invalid 
+	when the length was specified.
+
 2000-12-12  Havoc Pennington  <hp@pobox.com>
 
 	* gmain.c (g_main_context_destroy): don't try to use thread stuff

ChangeLog.pre-2-10

@@ -1,3 +1,14 @@
+2000-12-13  Havoc Pennington  <hp@redhat.com>
+
+	* gconvert.c (open_converter): make static
+
+	* gutf8.c (g_utf8_validate): Simplify logic a bit, maybe 
+	speeding it up - now we just return FALSE if we had to bail out
+	for any reason before getting to the end of the string, as defined 
+	by a nul byte if len was -1, defined by the len otherwise. This 
+	also fixes a bug where nul bytes were not treated as invalid 
+	when the length was specified.
+
 2000-12-12  Havoc Pennington  <hp@pobox.com>
 
 	* gmain.c (g_main_context_destroy): don't try to use thread stuff

ChangeLog.pre-2-12

@@ -1,3 +1,14 @@
+2000-12-13  Havoc Pennington  <hp@redhat.com>
+
+	* gconvert.c (open_converter): make static
+
+	* gutf8.c (g_utf8_validate): Simplify logic a bit, maybe 
+	speeding it up - now we just return FALSE if we had to bail out
+	for any reason before getting to the end of the string, as defined 
+	by a nul byte if len was -1, defined by the len otherwise. This 
+	also fixes a bug where nul bytes were not treated as invalid 
+	when the length was specified.
+
 2000-12-12  Havoc Pennington  <hp@pobox.com>
 
 	* gmain.c (g_main_context_destroy): don't try to use thread stuff

ChangeLog.pre-2-2

@@ -1,3 +1,14 @@
+2000-12-13  Havoc Pennington  <hp@redhat.com>
+
+	* gconvert.c (open_converter): make static
+
+	* gutf8.c (g_utf8_validate): Simplify logic a bit, maybe 
+	speeding it up - now we just return FALSE if we had to bail out
+	for any reason before getting to the end of the string, as defined 
+	by a nul byte if len was -1, defined by the len otherwise. This 
+	also fixes a bug where nul bytes were not treated as invalid 
+	when the length was specified.
+
 2000-12-12  Havoc Pennington  <hp@pobox.com>
 
 	* gmain.c (g_main_context_destroy): don't try to use thread stuff

ChangeLog.pre-2-4

@@ -1,3 +1,14 @@
+2000-12-13  Havoc Pennington  <hp@redhat.com>
+
+	* gconvert.c (open_converter): make static
+
+	* gutf8.c (g_utf8_validate): Simplify logic a bit, maybe 
+	speeding it up - now we just return FALSE if we had to bail out
+	for any reason before getting to the end of the string, as defined 
+	by a nul byte if len was -1, defined by the len otherwise. This 
+	also fixes a bug where nul bytes were not treated as invalid 
+	when the length was specified.
+
 2000-12-12  Havoc Pennington  <hp@pobox.com>
 
 	* gmain.c (g_main_context_destroy): don't try to use thread stuff

ChangeLog.pre-2-6

@@ -1,3 +1,14 @@
+2000-12-13  Havoc Pennington  <hp@redhat.com>
+
+	* gconvert.c (open_converter): make static
+
+	* gutf8.c (g_utf8_validate): Simplify logic a bit, maybe 
+	speeding it up - now we just return FALSE if we had to bail out
+	for any reason before getting to the end of the string, as defined 
+	by a nul byte if len was -1, defined by the len otherwise. This 
+	also fixes a bug where nul bytes were not treated as invalid 
+	when the length was specified.
+
 2000-12-12  Havoc Pennington  <hp@pobox.com>
 
 	* gmain.c (g_main_context_destroy): don't try to use thread stuff

ChangeLog.pre-2-8

@@ -1,3 +1,14 @@
+2000-12-13  Havoc Pennington  <hp@redhat.com>
+
+	* gconvert.c (open_converter): make static
+
+	* gutf8.c (g_utf8_validate): Simplify logic a bit, maybe 
+	speeding it up - now we just return FALSE if we had to bail out
+	for any reason before getting to the end of the string, as defined 
+	by a nul byte if len was -1, defined by the len otherwise. This 
+	also fixes a bug where nul bytes were not treated as invalid 
+	when the length was specified.
+
 2000-12-12  Havoc Pennington  <hp@pobox.com>
 
 	* gmain.c (g_main_context_destroy): don't try to use thread stuff

gconvert.c

@@ -80,7 +80,7 @@ g_iconv_close (GIConv converter)
   return iconv_close (cd);
 }
 
-GIConv
+static GIConv
 open_converter (const gchar *to_codeset,
                 const gchar *from_codeset,
 		GError     **error)

glib/gconvert.c

@@ -80,7 +80,7 @@ g_iconv_close (GIConv converter)
   return iconv_close (cd);
 }
 
-GIConv
+static GIConv
 open_converter (const gchar *to_codeset,
                 const gchar *from_codeset,
 		GError     **error)

glib/gutf8.c

@@ -550,7 +550,6 @@ g_utf8_validate (const gchar  *str,
 {
 
   const gchar *p;
-  gboolean retval = TRUE;
   
   if (end)
     *end = str;
@@ -566,26 +565,17 @@ g_utf8_validate (const gchar  *str,
       UTF8_COMPUTE (c, mask, len);
 
       if (len == -1)
-        {
-          retval = FALSE;
         break;
-        }
 
       /* check that the expected number of bytes exists in str */
       if (max_len >= 0 &&
           ((max_len - (p - str)) < len))
-        {
-          retval = FALSE;
         break;
-        }
         
       UTF8_GET (result, p, i, mask, len);
 
       if (result == (gunichar)-1)
-        {
-          retval = FALSE;
         break;
-        }
       
       p += len;
     }
@@ -593,7 +583,17 @@ g_utf8_validate (const gchar  *str,
   if (end)
     *end = p;
 
-  return retval;
+  /* See that we covered the entire length if a length was
+   * passed in, or that we ended on a nul if not
+   */
+  if (max_len >= 0 &&
+      p != (str + max_len))
+    return FALSE;
+  else if (max_len < 0 &&
+           *p != '\0')
+    return FALSE;
+  else
+    return TRUE;
 }
 
 

gutf8.c

@@ -550,7 +550,6 @@ g_utf8_validate (const gchar  *str,
 {
 
   const gchar *p;
-  gboolean retval = TRUE;
   
   if (end)
     *end = str;
@@ -566,26 +565,17 @@ g_utf8_validate (const gchar  *str,
       UTF8_COMPUTE (c, mask, len);
 
       if (len == -1)
-        {
-          retval = FALSE;
         break;
-        }
 
       /* check that the expected number of bytes exists in str */
       if (max_len >= 0 &&
           ((max_len - (p - str)) < len))
-        {
-          retval = FALSE;
         break;
-        }
         
       UTF8_GET (result, p, i, mask, len);
 
       if (result == (gunichar)-1)
-        {
-          retval = FALSE;
         break;
-        }
       
       p += len;
     }
@@ -593,7 +583,17 @@ g_utf8_validate (const gchar  *str,
   if (end)
     *end = p;
 
-  return retval;
+  /* See that we covered the entire length if a length was
+   * passed in, or that we ended on a nul if not
+   */
+  if (max_len >= 0 &&
+      p != (str + max_len))
+    return FALSE;
+  else if (max_len < 0 &&
+           *p != '\0')
+    return FALSE;
+  else
+    return TRUE;
 }