From 267031000f9f787bb321dd78ad0920975180d1c6 Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Fri, 5 Dec 2003 20:09:34 +0000 Subject: [PATCH] fix gint/gsize confusion. Fri Dec 5 12:09:13 2003 Manish Singh * glib/gunidecomp.c (_g_utf8_normalize_wc): fix gint/gsize confusion. --- ChangeLog | 6 +++++- ChangeLog.pre-2-10 | 6 +++++- ChangeLog.pre-2-12 | 6 +++++- ChangeLog.pre-2-4 | 6 +++++- ChangeLog.pre-2-6 | 6 +++++- ChangeLog.pre-2-8 | 6 +++++- glib/gunidecomp.c | 4 ++-- 7 files changed, 32 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 301d0fa..e64c25f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Dec 5 12:09:13 2003 Manish Singh + + * glib/gunidecomp.c (_g_utf8_normalize_wc): fix gint/gsize confusion. + 2003-12-04 Noah Levitt * glib/gunidecomp.c: Add hangul composition and decomposition to @@ -29,7 +33,7 @@ Wed Nov 26 16:45:16 2003 Roozbeh Pournader * tests/strtod-test.c: Fixed the tests to catch the above. -Sat Nov 22 14:16:51.15 2003 Andrew Lanoix +Sat Nov 22 14:16:51.15 2003 Andrew Lanoix * glib/giowin32.c: Bind inter-thread comminication sockets to INADDR_LOOPBACK instead of INADDR_ANY. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 301d0fa..e64c25f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +Fri Dec 5 12:09:13 2003 Manish Singh + + * glib/gunidecomp.c (_g_utf8_normalize_wc): fix gint/gsize confusion. + 2003-12-04 Noah Levitt * glib/gunidecomp.c: Add hangul composition and decomposition to @@ -29,7 +33,7 @@ Wed Nov 26 16:45:16 2003 Roozbeh Pournader * tests/strtod-test.c: Fixed the tests to catch the above. -Sat Nov 22 14:16:51.15 2003 Andrew Lanoix +Sat Nov 22 14:16:51.15 2003 Andrew Lanoix * glib/giowin32.c: Bind inter-thread comminication sockets to INADDR_LOOPBACK instead of INADDR_ANY. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 301d0fa..e64c25f 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,7 @@ +Fri Dec 5 12:09:13 2003 Manish Singh + + * glib/gunidecomp.c (_g_utf8_normalize_wc): fix gint/gsize confusion. + 2003-12-04 Noah Levitt * glib/gunidecomp.c: Add hangul composition and decomposition to @@ -29,7 +33,7 @@ Wed Nov 26 16:45:16 2003 Roozbeh Pournader * tests/strtod-test.c: Fixed the tests to catch the above. -Sat Nov 22 14:16:51.15 2003 Andrew Lanoix +Sat Nov 22 14:16:51.15 2003 Andrew Lanoix * glib/giowin32.c: Bind inter-thread comminication sockets to INADDR_LOOPBACK instead of INADDR_ANY. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 301d0fa..e64c25f 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,7 @@ +Fri Dec 5 12:09:13 2003 Manish Singh + + * glib/gunidecomp.c (_g_utf8_normalize_wc): fix gint/gsize confusion. + 2003-12-04 Noah Levitt * glib/gunidecomp.c: Add hangul composition and decomposition to @@ -29,7 +33,7 @@ Wed Nov 26 16:45:16 2003 Roozbeh Pournader * tests/strtod-test.c: Fixed the tests to catch the above. -Sat Nov 22 14:16:51.15 2003 Andrew Lanoix +Sat Nov 22 14:16:51.15 2003 Andrew Lanoix * glib/giowin32.c: Bind inter-thread comminication sockets to INADDR_LOOPBACK instead of INADDR_ANY. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 301d0fa..e64c25f 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,7 @@ +Fri Dec 5 12:09:13 2003 Manish Singh + + * glib/gunidecomp.c (_g_utf8_normalize_wc): fix gint/gsize confusion. + 2003-12-04 Noah Levitt * glib/gunidecomp.c: Add hangul composition and decomposition to @@ -29,7 +33,7 @@ Wed Nov 26 16:45:16 2003 Roozbeh Pournader * tests/strtod-test.c: Fixed the tests to catch the above. -Sat Nov 22 14:16:51.15 2003 Andrew Lanoix +Sat Nov 22 14:16:51.15 2003 Andrew Lanoix * glib/giowin32.c: Bind inter-thread comminication sockets to INADDR_LOOPBACK instead of INADDR_ANY. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 301d0fa..e64c25f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +Fri Dec 5 12:09:13 2003 Manish Singh + + * glib/gunidecomp.c (_g_utf8_normalize_wc): fix gint/gsize confusion. + 2003-12-04 Noah Levitt * glib/gunidecomp.c: Add hangul composition and decomposition to @@ -29,7 +33,7 @@ Wed Nov 26 16:45:16 2003 Roozbeh Pournader * tests/strtod-test.c: Fixed the tests to catch the above. -Sat Nov 22 14:16:51.15 2003 Andrew Lanoix +Sat Nov 22 14:16:51.15 2003 Andrew Lanoix * glib/giowin32.c: Bind inter-thread comminication sockets to INADDR_LOOPBACK instead of INADDR_ANY. diff --git a/glib/gunidecomp.c b/glib/gunidecomp.c index c4ef143..193ef70 100644 --- a/glib/gunidecomp.c +++ b/glib/gunidecomp.c @@ -357,7 +357,7 @@ _g_utf8_normalize_wc (const gchar *str, if (wc >= 0xac00 && wc <= 0xd7af) { - gint result_len; + gsize result_len; decompose_hangul (wc, NULL, &result_len); n_wc += result_len; } @@ -388,7 +388,7 @@ _g_utf8_normalize_wc (const gchar *str, if (wc >= 0xac00 && wc <= 0xd7af) { - gint result_len; + gsize result_len; decompose_hangul (wc, wc_buffer + n_wc, &result_len); n_wc += result_len; } -- 2.7.4