Fix stray character

Sun Jul 30 16:54:13 2000  Owen Taylor  <otaylor@redhat.com>

        * gunicode.h: Fix stray character

	* gutf8.c (g_unichar_to_utf8): Allow outbuf to be NULL, in
	which case we just compute the length.

diff --git a/ChangeLog b/ChangeLog
index acc659ba7781a358695138b2f5ed010fef8e7dd4..7baf383b34b0f61e683017826582dfc166206a16 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Jul 30 16:54:13 2000  Owen Taylor  <otaylor@redhat.com>
+
+        * gunicode.h: Fix stray character
+       
+       * gutf8.c (g_unichar_to_utf8): Allow outbuf to be NULL, in
+       which case we just compute the length.
+
 2000-07-31  Havoc Pennington  <hp@redhat.com>
 
        * Makefile.am (EXTRA_DIST): forgot to add .pc.in to EXTRA_DIST

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index acc659ba7781a358695138b2f5ed010fef8e7dd4..7baf383b34b0f61e683017826582dfc166206a16 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Sun Jul 30 16:54:13 2000  Owen Taylor  <otaylor@redhat.com>
+
+        * gunicode.h: Fix stray character
+       
+       * gutf8.c (g_unichar_to_utf8): Allow outbuf to be NULL, in
+       which case we just compute the length.
+
 2000-07-31  Havoc Pennington  <hp@redhat.com>
 
        * Makefile.am (EXTRA_DIST): forgot to add .pc.in to EXTRA_DIST

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index acc659ba7781a358695138b2f5ed010fef8e7dd4..7baf383b34b0f61e683017826582dfc166206a16 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Sun Jul 30 16:54:13 2000  Owen Taylor  <otaylor@redhat.com>
+
+        * gunicode.h: Fix stray character
+       
+       * gutf8.c (g_unichar_to_utf8): Allow outbuf to be NULL, in
+       which case we just compute the length.
+
 2000-07-31  Havoc Pennington  <hp@redhat.com>
 
        * Makefile.am (EXTRA_DIST): forgot to add .pc.in to EXTRA_DIST

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index acc659ba7781a358695138b2f5ed010fef8e7dd4..7baf383b34b0f61e683017826582dfc166206a16 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,10 @@
+Sun Jul 30 16:54:13 2000  Owen Taylor  <otaylor@redhat.com>
+
+        * gunicode.h: Fix stray character
+       
+       * gutf8.c (g_unichar_to_utf8): Allow outbuf to be NULL, in
+       which case we just compute the length.
+
 2000-07-31  Havoc Pennington  <hp@redhat.com>
 
        * Makefile.am (EXTRA_DIST): forgot to add .pc.in to EXTRA_DIST

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index acc659ba7781a358695138b2f5ed010fef8e7dd4..7baf383b34b0f61e683017826582dfc166206a16 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Sun Jul 30 16:54:13 2000  Owen Taylor  <otaylor@redhat.com>
+
+        * gunicode.h: Fix stray character
+       
+       * gutf8.c (g_unichar_to_utf8): Allow outbuf to be NULL, in
+       which case we just compute the length.
+
 2000-07-31  Havoc Pennington  <hp@redhat.com>
 
        * Makefile.am (EXTRA_DIST): forgot to add .pc.in to EXTRA_DIST

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index acc659ba7781a358695138b2f5ed010fef8e7dd4..7baf383b34b0f61e683017826582dfc166206a16 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Sun Jul 30 16:54:13 2000  Owen Taylor  <otaylor@redhat.com>
+
+        * gunicode.h: Fix stray character
+       
+       * gutf8.c (g_unichar_to_utf8): Allow outbuf to be NULL, in
+       which case we just compute the length.
+
 2000-07-31  Havoc Pennington  <hp@redhat.com>
 
        * Makefile.am (EXTRA_DIST): forgot to add .pc.in to EXTRA_DIST

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index acc659ba7781a358695138b2f5ed010fef8e7dd4..7baf383b34b0f61e683017826582dfc166206a16 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Sun Jul 30 16:54:13 2000  Owen Taylor  <otaylor@redhat.com>
+
+        * gunicode.h: Fix stray character
+       
+       * gutf8.c (g_unichar_to_utf8): Allow outbuf to be NULL, in
+       which case we just compute the length.
+
 2000-07-31  Havoc Pennington  <hp@redhat.com>
 
        * Makefile.am (EXTRA_DIST): forgot to add .pc.in to EXTRA_DIST

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index acc659ba7781a358695138b2f5ed010fef8e7dd4..7baf383b34b0f61e683017826582dfc166206a16 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Sun Jul 30 16:54:13 2000  Owen Taylor  <otaylor@redhat.com>
+
+        * gunicode.h: Fix stray character
+       
+       * gutf8.c (g_unichar_to_utf8): Allow outbuf to be NULL, in
+       which case we just compute the length.
+
 2000-07-31  Havoc Pennington  <hp@redhat.com>
 
        * Makefile.am (EXTRA_DIST): forgot to add .pc.in to EXTRA_DIST

diff --git a/glib/gunicode.h b/glib/gunicode.h
index 4018eb664bffe6ae90addb2c7a24cf7e8764dbba..18997b24a26b2af6a3f85ae55455e1e0b6071ef7 100644 (file)
--- a/glib/gunicode.h
+++ b/glib/gunicode.h
@@ -77,7 +77,7 @@ gboolean g_get_charset (char **charset);
 gboolean g_unichar_isalnum   (gunichar c);
 gboolean g_unichar_isalpha   (gunichar c);
 gboolean g_unichar_iscntrl   (gunichar c);
-gboolean g_unicphar_isdigit   (gunichar c);
+gboolean g_unichar_isdigit   (gunichar c);
 gboolean g_unichar_isgraph   (gunichar c);
 gboolean g_unichar_islower   (gunichar c);
 gboolean g_unichar_isprint   (gunichar c);

diff --git a/glib/gutf8.c b/glib/gutf8.c
index bf50d1eeecde0f9bbc0594f98482e5c368b148ca..a510dfd672408ed9de30dbb94d690cb30c93bffa 100644 (file)
--- a/glib/gutf8.c
+++ b/glib/gutf8.c
@@ -75,7 +75,6 @@
       (Result) <<= 6;                                                        \
       (Result) |= ((Chars)[(Count)] & 0x3f);                                 \
     }
-
 gchar g_utf8_skip[256] = {
   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
@@ -349,6 +348,8 @@ g_get_charset (char **charset)
  * g_unichar_to_utf8:
  * @ch: a ISO10646 character code
  * @out: output buffer, must have at least 6 bytes of space.
+ *       If %NULL, the length will be computed and returned
+ *       and nothing will be written to @out.
  * 
  * Convert a single character to utf8
  * 
@@ -392,12 +393,15 @@ g_unichar_to_utf8 (gunichar c, gchar *outbuf)
       len = 6;
     }
 
-  for (i = len - 1; i > 0; --i)
+  if (outbuf)
     {
-      outbuf[i] = (c & 0x3f) | 0x80;
-      c >>= 6;
+      for (i = len - 1; i > 0; --i)
+       {
+         outbuf[i] = (c & 0x3f) | 0x80;
+         c >>= 6;
+       }
+      outbuf[0] = c | first;
     }
-  outbuf[0] = c | first;
 
   return len;
 }

diff --git a/gunicode.h b/gunicode.h
index 4018eb664bffe6ae90addb2c7a24cf7e8764dbba..18997b24a26b2af6a3f85ae55455e1e0b6071ef7 100644 (file)
--- a/gunicode.h
+++ b/gunicode.h
@@ -77,7 +77,7 @@ gboolean g_get_charset (char **charset);
 gboolean g_unichar_isalnum   (gunichar c);
 gboolean g_unichar_isalpha   (gunichar c);
 gboolean g_unichar_iscntrl   (gunichar c);
-gboolean g_unicphar_isdigit   (gunichar c);
+gboolean g_unichar_isdigit   (gunichar c);
 gboolean g_unichar_isgraph   (gunichar c);
 gboolean g_unichar_islower   (gunichar c);
 gboolean g_unichar_isprint   (gunichar c);

diff --git a/gutf8.c b/gutf8.c
index bf50d1eeecde0f9bbc0594f98482e5c368b148ca..a510dfd672408ed9de30dbb94d690cb30c93bffa 100644 (file)
--- a/gutf8.c
+++ b/gutf8.c
@@ -75,7 +75,6 @@
       (Result) <<= 6;                                                        \
       (Result) |= ((Chars)[(Count)] & 0x3f);                                 \
     }
-
 gchar g_utf8_skip[256] = {
   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
@@ -349,6 +348,8 @@ g_get_charset (char **charset)
  * g_unichar_to_utf8:
  * @ch: a ISO10646 character code
  * @out: output buffer, must have at least 6 bytes of space.
+ *       If %NULL, the length will be computed and returned
+ *       and nothing will be written to @out.
  * 
  * Convert a single character to utf8
  * 
@@ -392,12 +393,15 @@ g_unichar_to_utf8 (gunichar c, gchar *outbuf)
       len = 6;
     }
 
-  for (i = len - 1; i > 0; --i)
+  if (outbuf)
     {
-      outbuf[i] = (c & 0x3f) | 0x80;
-      c >>= 6;
+      for (i = len - 1; i > 0; --i)
+       {
+         outbuf[i] = (c & 0x3f) | 0x80;
+         c >>= 6;
+       }
+      outbuf[0] = c | first;
     }
-  outbuf[0] = c | first;
 
   return len;
 }