luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-24 14:36:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add gunicomp.h (Reported by Sven Neumann).

Browse Source 
Wed Jul 11 11:13:50 2001  Owen Taylor  <otaylor@redhat.com>

	* glib/Makefile.am (libglib_1_3_la_SOURCES): Add gunicomp.h
	(Reported by Sven Neumann).

	* glib/guniprop.c (g_utf8_str/updown) glib/gunicollate.c
	(g_utf8_collate_key): Fix shadowing problems reported by
	many (D. Adler, S. Neumann, M. Murmane, L. Peter)
This commit is contained in:
Owen Taylor 2001-07-11 15:28:35 +00:00 committed by Owen Taylor
parent 11b0d06eee
commit be44b99002
11 changed files with 97 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Wed Jul 11 11:13:50 2001 Owen Taylor <otaylor@redhat.com>
* glib/Makefile.am (libglib_1_3_la_SOURCES): Add gunicomp.h
(Reported by Sven Neumann).
* glib/guniprop.c (g_utf8_str/updown) glib/gunicollate.c
(g_utf8_collate_key): Fix shadowing problems reported by
many (D. Adler, S. Neumann, M. Murmane, L. Peter)
Fri Jul 6 00:02:41 2001 Tim Janik <timj@gtk.org> Fri Jul 6 00:02:41 2001 Tim Janik <timj@gtk.org>
* glib/gmessages.c (printf_string_upper_bound): fix negative exponent * glib/gmessages.c (printf_string_upper_bound): fix negative exponent

9
ChangeLog.pre-2-0
View File

@ -1,3 +1,12 @@
Wed Jul 11 11:13:50 2001 Owen Taylor <otaylor@redhat.com>
* glib/Makefile.am (libglib_1_3_la_SOURCES): Add gunicomp.h
(Reported by Sven Neumann).
* glib/guniprop.c (g_utf8_str/updown) glib/gunicollate.c
(g_utf8_collate_key): Fix shadowing problems reported by
many (D. Adler, S. Neumann, M. Murmane, L. Peter)
Fri Jul 6 00:02:41 2001 Tim Janik <timj@gtk.org> Fri Jul 6 00:02:41 2001 Tim Janik <timj@gtk.org>
* glib/gmessages.c (printf_string_upper_bound): fix negative exponent * glib/gmessages.c (printf_string_upper_bound): fix negative exponent

9
ChangeLog.pre-2-10
View File

@ -1,3 +1,12 @@
Wed Jul 11 11:13:50 2001 Owen Taylor <otaylor@redhat.com>
* glib/Makefile.am (libglib_1_3_la_SOURCES): Add gunicomp.h
(Reported by Sven Neumann).
* glib/guniprop.c (g_utf8_str/updown) glib/gunicollate.c
(g_utf8_collate_key): Fix shadowing problems reported by
many (D. Adler, S. Neumann, M. Murmane, L. Peter)
Fri Jul 6 00:02:41 2001 Tim Janik <timj@gtk.org> Fri Jul 6 00:02:41 2001 Tim Janik <timj@gtk.org>
* glib/gmessages.c (printf_string_upper_bound): fix negative exponent * glib/gmessages.c (printf_string_upper_bound): fix negative exponent

9
ChangeLog.pre-2-12
View File

@ -1,3 +1,12 @@
Wed Jul 11 11:13:50 2001 Owen Taylor <otaylor@redhat.com>
* glib/Makefile.am (libglib_1_3_la_SOURCES): Add gunicomp.h
(Reported by Sven Neumann).
* glib/guniprop.c (g_utf8_str/updown) glib/gunicollate.c
(g_utf8_collate_key): Fix shadowing problems reported by
many (D. Adler, S. Neumann, M. Murmane, L. Peter)
Fri Jul 6 00:02:41 2001 Tim Janik <timj@gtk.org> Fri Jul 6 00:02:41 2001 Tim Janik <timj@gtk.org>
* glib/gmessages.c (printf_string_upper_bound): fix negative exponent * glib/gmessages.c (printf_string_upper_bound): fix negative exponent

9
ChangeLog.pre-2-2
View File

@ -1,3 +1,12 @@
Wed Jul 11 11:13:50 2001 Owen Taylor <otaylor@redhat.com>
* glib/Makefile.am (libglib_1_3_la_SOURCES): Add gunicomp.h
(Reported by Sven Neumann).
* glib/guniprop.c (g_utf8_str/updown) glib/gunicollate.c
(g_utf8_collate_key): Fix shadowing problems reported by
many (D. Adler, S. Neumann, M. Murmane, L. Peter)
Fri Jul 6 00:02:41 2001 Tim Janik <timj@gtk.org> Fri Jul 6 00:02:41 2001 Tim Janik <timj@gtk.org>
* glib/gmessages.c (printf_string_upper_bound): fix negative exponent * glib/gmessages.c (printf_string_upper_bound): fix negative exponent

9
ChangeLog.pre-2-4
View File

@ -1,3 +1,12 @@
Wed Jul 11 11:13:50 2001 Owen Taylor <otaylor@redhat.com>
* glib/Makefile.am (libglib_1_3_la_SOURCES): Add gunicomp.h
(Reported by Sven Neumann).
* glib/guniprop.c (g_utf8_str/updown) glib/gunicollate.c
(g_utf8_collate_key): Fix shadowing problems reported by
many (D. Adler, S. Neumann, M. Murmane, L. Peter)
Fri Jul 6 00:02:41 2001 Tim Janik <timj@gtk.org> Fri Jul 6 00:02:41 2001 Tim Janik <timj@gtk.org>
* glib/gmessages.c (printf_string_upper_bound): fix negative exponent * glib/gmessages.c (printf_string_upper_bound): fix negative exponent

9
ChangeLog.pre-2-6
View File

@ -1,3 +1,12 @@
Wed Jul 11 11:13:50 2001 Owen Taylor <otaylor@redhat.com>
* glib/Makefile.am (libglib_1_3_la_SOURCES): Add gunicomp.h
(Reported by Sven Neumann).
* glib/guniprop.c (g_utf8_str/updown) glib/gunicollate.c
(g_utf8_collate_key): Fix shadowing problems reported by
many (D. Adler, S. Neumann, M. Murmane, L. Peter)
Fri Jul 6 00:02:41 2001 Tim Janik <timj@gtk.org> Fri Jul 6 00:02:41 2001 Tim Janik <timj@gtk.org>
* glib/gmessages.c (printf_string_upper_bound): fix negative exponent * glib/gmessages.c (printf_string_upper_bound): fix negative exponent

9
ChangeLog.pre-2-8
View File

@ -1,3 +1,12 @@
Wed Jul 11 11:13:50 2001 Owen Taylor <otaylor@redhat.com>
* glib/Makefile.am (libglib_1_3_la_SOURCES): Add gunicomp.h
(Reported by Sven Neumann).
* glib/guniprop.c (g_utf8_str/updown) glib/gunicollate.c
(g_utf8_collate_key): Fix shadowing problems reported by
many (D. Adler, S. Neumann, M. Murmane, L. Peter)
Fri Jul 6 00:02:41 2001 Tim Janik <timj@gtk.org> Fri Jul 6 00:02:41 2001 Tim Janik <timj@gtk.org>
* glib/gmessages.c (printf_string_upper_bound): fix negative exponent * glib/gmessages.c (printf_string_upper_bound): fix negative exponent

1
glib/Makefile.am
View File

@ -50,6 +50,7 @@ libglib_1_3_la_SOURCES = \
gunibreak.c \ gunibreak.c \
gunichartables.h \ gunichartables.h \
gunicollate.c \ gunicollate.c \
gunicomp.h \
gunidecomp.h \ gunidecomp.h \
gunidecomp.c \ gunidecomp.c \
gutils.c gutils.c

33
glib/gunicollate.c
View File

@ -165,7 +165,7 @@ g_utf8_collate_key (const gchar *str,
gssize len) gssize len)
{ {
gchar *result; gchar *result;
size_t len; size_t xfrm_len;
#ifdef __STDC_ISO_10646__ #ifdef __STDC_ISO_10646__
@ -176,16 +176,16 @@ g_utf8_collate_key (const gchar *str,
setlocale (LC_COLLATE, ""); setlocale (LC_COLLATE, "");
len = wcsxfrm (NULL, (wchar_t *)str_norm, 0); xfrm_len = wcsxfrm (NULL, (wchar_t *)str_norm, 0);
result_wc = g_new (wchar_t, len + 1); result_wc = g_new (wchar_t, xfrm_len + 1);
wcsxfrm (result_wc, (wchar_t *)str_norm, len + 1); wcsxfrm (result_wc, (wchar_t *)str_norm, xfrm_len + 1);
for (i=0; i < len; i++) for (i=0; i < xfrm_len; i++)
result_len += utf8_encode (NULL, result_wc[i]); result_len += utf8_encode (NULL, result_wc[i]);
result = g_malloc (result_len + 1); result = g_malloc (result_len + 1);
result_len = 0; result_len = 0;
for (i=0; i < len; i++) for (i=0; i < xfrm_len; i++)
result_len += utf8_encode (result + result_len, result_wc[i]); result_len += utf8_encode (result + result_len, result_wc[i]);
result[result_len] = '\0'; result[result_len] = '\0';
@ -201,9 +201,9 @@ g_utf8_collate_key (const gchar *str,
if (g_get_charset (&charset)) if (g_get_charset (&charset))
{ {
len = strxfrm (NULL, str_norm, 0); xfrm_len = strxfrm (NULL, str_norm, 0);
result = g_malloc (len + 1); result = g_malloc (xfrm_len + 1);
strxfrm (result, str_norm, len + 1); strxfrm (result, str_norm, xfrm_len + 1);
} }
else else
{ {
@ -211,22 +211,21 @@ g_utf8_collate_key (const gchar *str,
if (str_locale) if (str_locale)
{ {
len = strxfrm (NULL, str_locale, 0); xfrm_len = strxfrm (NULL, str_locale, 0);
result = g_malloc (len + 2); result = g_malloc (xfrm_len + 2);
result[0] = 'A'; result[0] = 'A';
strxfrm (result + 1, str_locale, len + 1); strxfrm (result + 1, str_locale, xfrm_len + 1);
g_free (str_locale); g_free (str_locale);
} }
else else
{ {
len = strlen (str_norm); xfrm_len = strlen (str_norm);
result = g_malloc (len + 2); result = g_malloc (xfrm_len + 2);
result[0] = 'B'; result[0] = 'B';
memcpy (result + 1, str_norm, len); memcpy (result + 1, str_norm, xfrm_len);
result[len+1] = '\0'; result[xfrm_len+1] = '\0';
} }
} }
g_free (str_norm); g_free (str_norm);

16
glib/guniprop.c
View File

@ -711,7 +711,7 @@ gchar *
g_utf8_strup (const gchar *str, g_utf8_strup (const gchar *str,
gssize len) gssize len)
{ {
gsize len; gsize result_len;
LocaleType locale_type; LocaleType locale_type;
gchar *result; gchar *result;
@ -722,10 +722,10 @@ g_utf8_strup (const gchar *str,
/* /*
* We use a two pass approach to keep memory management simple * We use a two pass approach to keep memory management simple
*/ */
len = real_toupper (str, len, NULL, locale_type); result_len = real_toupper (str, len, NULL, locale_type);
result = g_malloc (len + 1); result = g_malloc (result_len + 1);
real_toupper (str, len, result, locale_type); real_toupper (str, len, result, locale_type);
result[len] = '\0'; result[result_len] = '\0';
return result; return result;
} }
@ -827,7 +827,7 @@ gchar *
g_utf8_strdown (const gchar *str, g_utf8_strdown (const gchar *str,
gssize len) gssize len)
{ {
gsize len; gsize result_len;
LocaleType locale_type; LocaleType locale_type;
gchar *result; gchar *result;
@ -838,10 +838,10 @@ g_utf8_strdown (const gchar *str,
/* /*
* We use a two pass approach to keep memory management simple * We use a two pass approach to keep memory management simple
*/ */
len = real_tolower (str, len, NULL, locale_type); result_len = real_tolower (str, len, NULL, locale_type);
result = g_malloc (len + 1); result = g_malloc (result_len + 1);
real_tolower (str, len, result, locale_type); real_tolower (str, len, result, locale_type);
result[len] = '\0'; result[result_len] = '\0';
return result; return result;
} }