From 386bb0faadd98c190f171cbdd4c51dba50e85505 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Tue, 6 Dec 2011 19:41:31 +0000 Subject: [PATCH] unicode: Fix a few issues with G_UNICHAR_MAX_DECOMPOSITION_LENGTH Raised by Matthias in bgo#665685 but which I didn't spot until after pushing commit 3ac7c35656649b1d1fcf2ccaa670b854809d4cd8. Renames G_UNICHAR_MAX_DECOMPOSITION_LEN to G_UNICHAR_MAX_DECOMPOSITION_LENGTH and fixes a few documentation issues. See: bgo#665685 --- docs/reference/glib/glib-sections.txt | 1 + glib/gunicode.h | 4 ++-- glib/gunidecomp.c | 5 +++-- glib/guniprop.c | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt index 8e88d73..1557258 100644 --- a/docs/reference/glib/glib-sections.txt +++ b/docs/reference/glib/glib-sections.txt @@ -2694,6 +2694,7 @@ g_unichar_xdigit_value g_unichar_compose g_unichar_decompose g_unichar_fully_decompose +G_UNICHAR_MAX_DECOMPOSITION_LENGTH GUnicodeType G_UNICODE_COMBINING_MARK g_unichar_type diff --git a/glib/gunicode.h b/glib/gunicode.h index f89c07c..3350e77 100644 --- a/glib/gunicode.h +++ b/glib/gunicode.h @@ -552,7 +552,7 @@ gsize g_unichar_fully_decompose (gunichar ch, gsize result_len); /** - * G_UNICHAR_MAX_COMPAT_DECOMPOSITION_LEN: + * G_UNICHAR_MAX_DECOMPOSITION_LENGTH: * * The maximum length (in codepoints) of a compatibility or canonical * decomposition of a single Unicode character. @@ -561,7 +561,7 @@ gsize g_unichar_fully_decompose (gunichar ch, * * Since: 2.31.3 */ -#define G_UNICHAR_MAX_DECOMPOSITION_LEN 18 /* codepoints */ +#define G_UNICHAR_MAX_DECOMPOSITION_LENGTH 18 /* codepoints */ /* Compute canonical ordering of a string in-place. This rearranges decomposed characters in the string according to their combining diff --git a/glib/gunidecomp.c b/glib/gunidecomp.c index 090b42d..8ba24fd 100644 --- a/glib/gunidecomp.c +++ b/glib/gunidecomp.c @@ -700,8 +700,9 @@ g_unichar_compose (gunichar a, * currently all decompositions are of length at most 4, but * this may change in the future (very unlikely though). * At any rate, Unicode does guarantee that a buffer of length - * %G_UNICHAR_MAX_DECOMPOSITION_LEN is always enough for both compatibility and - * canonical decompositions, so that is the size recommended. + * 18 is always enough for both compatibility and canonical + * decompositions, so that is the size recommended. This is provided + * as %G_UNICHAR_MAX_DECOMPOSITION_LENGTH. * * See UAX#15 * for details. diff --git a/glib/guniprop.c b/glib/guniprop.c index 5b818e3..ec24241 100644 --- a/glib/guniprop.c +++ b/glib/guniprop.c @@ -855,7 +855,7 @@ real_toupper (const gchar *str, * which could simplify this considerably. */ gsize decomp_len, i; - gunichar decomp[G_UNICHAR_MAX_DECOMPOSITION_LEN]; + gunichar decomp[G_UNICHAR_MAX_DECOMPOSITION_LENGTH]; decomp_len = g_unichar_fully_decompose (c, FALSE, decomp, G_N_ELEMENTS (decomp)); for (i=0; i < decomp_len; i++) -- 2.7.4