From: Owen Taylor <otaylor@redhat.com>
Date: Mon, 18 Sep 2000 14:55:24 +0000 (+0000)
Subject: Implement g_ucs4_to_utf8 which was in
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=ddbb2ea440c537a88d55761ad2bc5fbd23149b6a;p=dana%2Fcg-glib.git

Implement g_ucs4_to_utf8 which was in

Mon Sep 18 10:58:21 2000  Owen Taylor  <otaylor@redhat.com>

	* gutf8.c: Implement g_ucs4_to_utf8 which was in
---

diff --git a/ChangeLog b/ChangeLog
index 60fe94ea..e567127d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,15 @@
+Mon Sep 18 10:58:21 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gutf8.c: Implement g_ucs4_to_utf8 which was in
+	the header file but not implemented.
+
 Sun Sep 17 2000 Elliot Lee <sopwith@redhat.com>
-	* glib.h configure.in: Define g_alloca() as an alloca-that-works-anywhere.
-	* gconvert.c: Fix warnings which could have caused problems on 64-bit platforms.
+
+	* glib.h configure.in: Define g_alloca() as an
+	alloca-that-works-anywhere.
+	
+	* gconvert.c: Fix warnings which could have caused problems on
+	64-bit platforms.
 
 Sun Sep 10 12:37:40 2000  Owen Taylor  <otaylor@redhat.com>
 
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 60fe94ea..e567127d 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,6 +1,15 @@
+Mon Sep 18 10:58:21 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gutf8.c: Implement g_ucs4_to_utf8 which was in
+	the header file but not implemented.
+
 Sun Sep 17 2000 Elliot Lee <sopwith@redhat.com>
-	* glib.h configure.in: Define g_alloca() as an alloca-that-works-anywhere.
-	* gconvert.c: Fix warnings which could have caused problems on 64-bit platforms.
+
+	* glib.h configure.in: Define g_alloca() as an
+	alloca-that-works-anywhere.
+	
+	* gconvert.c: Fix warnings which could have caused problems on
+	64-bit platforms.
 
 Sun Sep 10 12:37:40 2000  Owen Taylor  <otaylor@redhat.com>
 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 60fe94ea..e567127d 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,6 +1,15 @@
+Mon Sep 18 10:58:21 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gutf8.c: Implement g_ucs4_to_utf8 which was in
+	the header file but not implemented.
+
 Sun Sep 17 2000 Elliot Lee <sopwith@redhat.com>
-	* glib.h configure.in: Define g_alloca() as an alloca-that-works-anywhere.
-	* gconvert.c: Fix warnings which could have caused problems on 64-bit platforms.
+
+	* glib.h configure.in: Define g_alloca() as an
+	alloca-that-works-anywhere.
+	
+	* gconvert.c: Fix warnings which could have caused problems on
+	64-bit platforms.
 
 Sun Sep 10 12:37:40 2000  Owen Taylor  <otaylor@redhat.com>
 
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 60fe94ea..e567127d 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,6 +1,15 @@
+Mon Sep 18 10:58:21 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gutf8.c: Implement g_ucs4_to_utf8 which was in
+	the header file but not implemented.
+
 Sun Sep 17 2000 Elliot Lee <sopwith@redhat.com>
-	* glib.h configure.in: Define g_alloca() as an alloca-that-works-anywhere.
-	* gconvert.c: Fix warnings which could have caused problems on 64-bit platforms.
+
+	* glib.h configure.in: Define g_alloca() as an
+	alloca-that-works-anywhere.
+	
+	* gconvert.c: Fix warnings which could have caused problems on
+	64-bit platforms.
 
 Sun Sep 10 12:37:40 2000  Owen Taylor  <otaylor@redhat.com>
 
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 60fe94ea..e567127d 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,6 +1,15 @@
+Mon Sep 18 10:58:21 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gutf8.c: Implement g_ucs4_to_utf8 which was in
+	the header file but not implemented.
+
 Sun Sep 17 2000 Elliot Lee <sopwith@redhat.com>
-	* glib.h configure.in: Define g_alloca() as an alloca-that-works-anywhere.
-	* gconvert.c: Fix warnings which could have caused problems on 64-bit platforms.
+
+	* glib.h configure.in: Define g_alloca() as an
+	alloca-that-works-anywhere.
+	
+	* gconvert.c: Fix warnings which could have caused problems on
+	64-bit platforms.
 
 Sun Sep 10 12:37:40 2000  Owen Taylor  <otaylor@redhat.com>
 
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 60fe94ea..e567127d 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,6 +1,15 @@
+Mon Sep 18 10:58:21 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gutf8.c: Implement g_ucs4_to_utf8 which was in
+	the header file but not implemented.
+
 Sun Sep 17 2000 Elliot Lee <sopwith@redhat.com>
-	* glib.h configure.in: Define g_alloca() as an alloca-that-works-anywhere.
-	* gconvert.c: Fix warnings which could have caused problems on 64-bit platforms.
+
+	* glib.h configure.in: Define g_alloca() as an
+	alloca-that-works-anywhere.
+	
+	* gconvert.c: Fix warnings which could have caused problems on
+	64-bit platforms.
 
 Sun Sep 10 12:37:40 2000  Owen Taylor  <otaylor@redhat.com>
 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 60fe94ea..e567127d 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,6 +1,15 @@
+Mon Sep 18 10:58:21 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gutf8.c: Implement g_ucs4_to_utf8 which was in
+	the header file but not implemented.
+
 Sun Sep 17 2000 Elliot Lee <sopwith@redhat.com>
-	* glib.h configure.in: Define g_alloca() as an alloca-that-works-anywhere.
-	* gconvert.c: Fix warnings which could have caused problems on 64-bit platforms.
+
+	* glib.h configure.in: Define g_alloca() as an
+	alloca-that-works-anywhere.
+	
+	* gconvert.c: Fix warnings which could have caused problems on
+	64-bit platforms.
 
 Sun Sep 10 12:37:40 2000  Owen Taylor  <otaylor@redhat.com>
 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 60fe94ea..e567127d 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,6 +1,15 @@
+Mon Sep 18 10:58:21 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gutf8.c: Implement g_ucs4_to_utf8 which was in
+	the header file but not implemented.
+
 Sun Sep 17 2000 Elliot Lee <sopwith@redhat.com>
-	* glib.h configure.in: Define g_alloca() as an alloca-that-works-anywhere.
-	* gconvert.c: Fix warnings which could have caused problems on 64-bit platforms.
+
+	* glib.h configure.in: Define g_alloca() as an
+	alloca-that-works-anywhere.
+	
+	* gconvert.c: Fix warnings which could have caused problems on
+	64-bit platforms.
 
 Sun Sep 10 12:37:40 2000  Owen Taylor  <otaylor@redhat.com>
 
diff --git a/docs/reference/glib/tmpl/error_reporting.sgml b/docs/reference/glib/tmpl/error_reporting.sgml
index df4ac510..adc7f8f3 100644
--- a/docs/reference/glib/tmpl/error_reporting.sgml
+++ b/docs/reference/glib/tmpl/error_reporting.sgml
@@ -454,8 +454,7 @@ Summary of rules for use of #GError:
 
 </para>
 
-@err: 
-<!--
+@err: <!--
 Local variables:
 mode: sgml
 sgml-parent-document: ("../glib-docs.sgml" "book" "refsect2" "")
diff --git a/glib/gutf8.c b/glib/gutf8.c
index f98f1372..1f31f6e8 100644
--- a/glib/gutf8.c
+++ b/glib/gutf8.c
@@ -487,6 +487,41 @@ g_utf8_to_ucs4 (const char *str, int len)
   return result;
 }
 
+/**
+ * g_ucs4_to_utf8:
+ * @str: a UCS-4 encoded string
+ * @len: the length of @
+ * 
+ * Convert a string from a 32-bit fixed width representation as UCS-4.
+ * to UTF-8.
+ * 
+ * Return value: a pointer to a newly allocated UTF-8 string.
+ *               This value must be freed with g_free()
+ **/
+gchar *
+g_ucs4_to_utf8 (const gunichar *str, int len)
+{
+  gint result_length;
+  gchar *result, *p;
+  gint i;
+
+  result_length = 0;
+  for (i = 0; i < len ; i++)
+    result_length += g_unichar_to_utf8 (str[i], NULL);
+
+  result_length++;
+
+  result = g_malloc (result_length + 1);
+  p = result;
+
+  for (i = 0; i < len ; i++)
+    p += g_unichar_to_utf8 (str[i], p);
+  
+  *p = '\0';
+
+  return result;
+}
+
 /**
  * g_utf8_validate:
  * @str: a pointer to character data
diff --git a/gutf8.c b/gutf8.c
index f98f1372..1f31f6e8 100644
--- a/gutf8.c
+++ b/gutf8.c
@@ -487,6 +487,41 @@ g_utf8_to_ucs4 (const char *str, int len)
   return result;
 }
 
+/**
+ * g_ucs4_to_utf8:
+ * @str: a UCS-4 encoded string
+ * @len: the length of @
+ * 
+ * Convert a string from a 32-bit fixed width representation as UCS-4.
+ * to UTF-8.
+ * 
+ * Return value: a pointer to a newly allocated UTF-8 string.
+ *               This value must be freed with g_free()
+ **/
+gchar *
+g_ucs4_to_utf8 (const gunichar *str, int len)
+{
+  gint result_length;
+  gchar *result, *p;
+  gint i;
+
+  result_length = 0;
+  for (i = 0; i < len ; i++)
+    result_length += g_unichar_to_utf8 (str[i], NULL);
+
+  result_length++;
+
+  result = g_malloc (result_length + 1);
+  p = result;
+
+  for (i = 0; i < len ; i++)
+    p += g_unichar_to_utf8 (str[i], p);
+  
+  *p = '\0';
+
+  return result;
+}
+
 /**
  * g_utf8_validate:
  * @str: a pointer to character data