diff --git a/ChangeLog b/ChangeLog index a4b0d1077..97a05b6a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +Fri Jul 20 14:11:29 2001 Owen Taylor + + * glib/gutf8.c glib/gunidecomp.c: s/size_t/gsize/ to match + prototypes. + +Thu Jul 19 16:05:21 2001 Owen Taylor + + * glib/gcompletion.c (g_completion_complete): Fix memory + leak and dubious list manipulation. (Found by + Ron Koerner, #53408) + + * glib/gfileutils.c (get_contents_stdio): Call fclose() + on FILE * on error. (#57057) + 2001-07-20 Hans Breuer * glib/glib/giowin32.c : make it compile again @@ -127,7 +141,6 @@ Fri Jul 6 22:34:32 2001 Owen Taylor * configure.in: added Basque (eu) to ALL_LINGUAS ->>>>>>> 1.757 Mon Jul 2 19:48:52 2001 Andrew Lanoix *giowin32.c: g_source_remove()ing an socket iochannel closes diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index a4b0d1077..97a05b6a6 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,17 @@ +Fri Jul 20 14:11:29 2001 Owen Taylor + + * glib/gutf8.c glib/gunidecomp.c: s/size_t/gsize/ to match + prototypes. + +Thu Jul 19 16:05:21 2001 Owen Taylor + + * glib/gcompletion.c (g_completion_complete): Fix memory + leak and dubious list manipulation. (Found by + Ron Koerner, #53408) + + * glib/gfileutils.c (get_contents_stdio): Call fclose() + on FILE * on error. (#57057) + 2001-07-20 Hans Breuer * glib/glib/giowin32.c : make it compile again @@ -127,7 +141,6 @@ Fri Jul 6 22:34:32 2001 Owen Taylor * configure.in: added Basque (eu) to ALL_LINGUAS ->>>>>>> 1.757 Mon Jul 2 19:48:52 2001 Andrew Lanoix *giowin32.c: g_source_remove()ing an socket iochannel closes diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a4b0d1077..97a05b6a6 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,17 @@ +Fri Jul 20 14:11:29 2001 Owen Taylor + + * glib/gutf8.c glib/gunidecomp.c: s/size_t/gsize/ to match + prototypes. + +Thu Jul 19 16:05:21 2001 Owen Taylor + + * glib/gcompletion.c (g_completion_complete): Fix memory + leak and dubious list manipulation. (Found by + Ron Koerner, #53408) + + * glib/gfileutils.c (get_contents_stdio): Call fclose() + on FILE * on error. (#57057) + 2001-07-20 Hans Breuer * glib/glib/giowin32.c : make it compile again @@ -127,7 +141,6 @@ Fri Jul 6 22:34:32 2001 Owen Taylor * configure.in: added Basque (eu) to ALL_LINGUAS ->>>>>>> 1.757 Mon Jul 2 19:48:52 2001 Andrew Lanoix *giowin32.c: g_source_remove()ing an socket iochannel closes diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index a4b0d1077..97a05b6a6 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,17 @@ +Fri Jul 20 14:11:29 2001 Owen Taylor + + * glib/gutf8.c glib/gunidecomp.c: s/size_t/gsize/ to match + prototypes. + +Thu Jul 19 16:05:21 2001 Owen Taylor + + * glib/gcompletion.c (g_completion_complete): Fix memory + leak and dubious list manipulation. (Found by + Ron Koerner, #53408) + + * glib/gfileutils.c (get_contents_stdio): Call fclose() + on FILE * on error. (#57057) + 2001-07-20 Hans Breuer * glib/glib/giowin32.c : make it compile again @@ -127,7 +141,6 @@ Fri Jul 6 22:34:32 2001 Owen Taylor * configure.in: added Basque (eu) to ALL_LINGUAS ->>>>>>> 1.757 Mon Jul 2 19:48:52 2001 Andrew Lanoix *giowin32.c: g_source_remove()ing an socket iochannel closes diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index a4b0d1077..97a05b6a6 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,17 @@ +Fri Jul 20 14:11:29 2001 Owen Taylor + + * glib/gutf8.c glib/gunidecomp.c: s/size_t/gsize/ to match + prototypes. + +Thu Jul 19 16:05:21 2001 Owen Taylor + + * glib/gcompletion.c (g_completion_complete): Fix memory + leak and dubious list manipulation. (Found by + Ron Koerner, #53408) + + * glib/gfileutils.c (get_contents_stdio): Call fclose() + on FILE * on error. (#57057) + 2001-07-20 Hans Breuer * glib/glib/giowin32.c : make it compile again @@ -127,7 +141,6 @@ Fri Jul 6 22:34:32 2001 Owen Taylor * configure.in: added Basque (eu) to ALL_LINGUAS ->>>>>>> 1.757 Mon Jul 2 19:48:52 2001 Andrew Lanoix *giowin32.c: g_source_remove()ing an socket iochannel closes diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index a4b0d1077..97a05b6a6 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,17 @@ +Fri Jul 20 14:11:29 2001 Owen Taylor + + * glib/gutf8.c glib/gunidecomp.c: s/size_t/gsize/ to match + prototypes. + +Thu Jul 19 16:05:21 2001 Owen Taylor + + * glib/gcompletion.c (g_completion_complete): Fix memory + leak and dubious list manipulation. (Found by + Ron Koerner, #53408) + + * glib/gfileutils.c (get_contents_stdio): Call fclose() + on FILE * on error. (#57057) + 2001-07-20 Hans Breuer * glib/glib/giowin32.c : make it compile again @@ -127,7 +141,6 @@ Fri Jul 6 22:34:32 2001 Owen Taylor * configure.in: added Basque (eu) to ALL_LINGUAS ->>>>>>> 1.757 Mon Jul 2 19:48:52 2001 Andrew Lanoix *giowin32.c: g_source_remove()ing an socket iochannel closes diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index a4b0d1077..97a05b6a6 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,17 @@ +Fri Jul 20 14:11:29 2001 Owen Taylor + + * glib/gutf8.c glib/gunidecomp.c: s/size_t/gsize/ to match + prototypes. + +Thu Jul 19 16:05:21 2001 Owen Taylor + + * glib/gcompletion.c (g_completion_complete): Fix memory + leak and dubious list manipulation. (Found by + Ron Koerner, #53408) + + * glib/gfileutils.c (get_contents_stdio): Call fclose() + on FILE * on error. (#57057) + 2001-07-20 Hans Breuer * glib/glib/giowin32.c : make it compile again @@ -127,7 +141,6 @@ Fri Jul 6 22:34:32 2001 Owen Taylor * configure.in: added Basque (eu) to ALL_LINGUAS ->>>>>>> 1.757 Mon Jul 2 19:48:52 2001 Andrew Lanoix *giowin32.c: g_source_remove()ing an socket iochannel closes diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a4b0d1077..97a05b6a6 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,17 @@ +Fri Jul 20 14:11:29 2001 Owen Taylor + + * glib/gutf8.c glib/gunidecomp.c: s/size_t/gsize/ to match + prototypes. + +Thu Jul 19 16:05:21 2001 Owen Taylor + + * glib/gcompletion.c (g_completion_complete): Fix memory + leak and dubious list manipulation. (Found by + Ron Koerner, #53408) + + * glib/gfileutils.c (get_contents_stdio): Call fclose() + on FILE * on error. (#57057) + 2001-07-20 Hans Breuer * glib/glib/giowin32.c : make it compile again @@ -127,7 +141,6 @@ Fri Jul 6 22:34:32 2001 Owen Taylor * configure.in: added Basque (eu) to ALL_LINGUAS ->>>>>>> 1.757 Mon Jul 2 19:48:52 2001 Andrew Lanoix *giowin32.c: g_source_remove()ing an socket iochannel closes diff --git a/glib/gunidecomp.c b/glib/gunidecomp.c index 6af932054..8f556fa23 100644 --- a/glib/gunidecomp.c +++ b/glib/gunidecomp.c @@ -41,9 +41,9 @@ /* Compute the canonical ordering of a string in-place. */ void g_unicode_canonical_ordering (gunichar *string, - size_t len) + gsize len) { - size_t i; + gsize i; int swap = 1; while (swap) @@ -56,7 +56,7 @@ g_unicode_canonical_ordering (gunichar *string, int next = COMBINING_CLASS (string[i + 1]); if (next != 0 && last > next) { - size_t j; + gsize j; /* Percolate item leftward through string. */ for (j = i; j > 0; --j) { @@ -123,7 +123,7 @@ find_decomposition (gunichar ch, gunichar * g_unicode_canonical_decomposition (gunichar ch, - size_t *result_len) + gsize *result_len) { guchar *decomp = find_decomposition (ch, FALSE); gunichar *r; @@ -263,7 +263,7 @@ _g_utf8_normalize_wc (const gchar *str, gunichar wc = g_utf8_get_char (p); guchar *decomp; int cc; - size_t old_n_wc = n_wc; + gsize old_n_wc = n_wc; decomp = find_decomposition (wc, do_compat); diff --git a/glib/gutf8.c b/glib/gutf8.c index 912d5b599..222dff7fb 100644 --- a/glib/gutf8.c +++ b/glib/gutf8.c @@ -328,7 +328,9 @@ g_utf8_pointer_to_offset (const gchar *str, * Return value: @dest **/ gchar * -g_utf8_strncpy (gchar *dest, const gchar *src, size_t n) +g_utf8_strncpy (gchar *dest, + const gchar *src, + gsize n) { const gchar *s = src; while (n && *s)