diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-12 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 9 | ||||
| -rw-r--r-- | glib/gconvert.c | 4 | ||||
| -rw-r--r-- | glib/gmem.c | 2 | ||||
| -rw-r--r-- | tests/patterntest.c | 2 |
10 files changed, 67 insertions, 4 deletions
@@ -1,3 +1,12 @@ +Tue Jun 11 17:03:39 2002 Owen Taylor <otaylor@redhat.com> + + * tests/patterntest.c (test_compilation) + * glib/gmem.c (profiler_try_realloc): A couple + of 64-bit printf format fix from George Lebl. + + * glib/gconvert.c (open_converter): Fix gsize/gint + mixup for g_iconv() arguments. + 2002-06-03 Matthias Clasen <maclas@gmx.de> * glib/gwin32.c (g_win32_get_package_installation_directory): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 45b6f773a..118da5fe2 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +Tue Jun 11 17:03:39 2002 Owen Taylor <otaylor@redhat.com> + + * tests/patterntest.c (test_compilation) + * glib/gmem.c (profiler_try_realloc): A couple + of 64-bit printf format fix from George Lebl. + + * glib/gconvert.c (open_converter): Fix gsize/gint + mixup for g_iconv() arguments. + 2002-06-03 Matthias Clasen <maclas@gmx.de> * glib/gwin32.c (g_win32_get_package_installation_directory): diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 45b6f773a..118da5fe2 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,12 @@ +Tue Jun 11 17:03:39 2002 Owen Taylor <otaylor@redhat.com> + + * tests/patterntest.c (test_compilation) + * glib/gmem.c (profiler_try_realloc): A couple + of 64-bit printf format fix from George Lebl. + + * glib/gconvert.c (open_converter): Fix gsize/gint + mixup for g_iconv() arguments. + 2002-06-03 Matthias Clasen <maclas@gmx.de> * glib/gwin32.c (g_win32_get_package_installation_directory): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 45b6f773a..118da5fe2 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +Tue Jun 11 17:03:39 2002 Owen Taylor <otaylor@redhat.com> + + * tests/patterntest.c (test_compilation) + * glib/gmem.c (profiler_try_realloc): A couple + of 64-bit printf format fix from George Lebl. + + * glib/gconvert.c (open_converter): Fix gsize/gint + mixup for g_iconv() arguments. + 2002-06-03 Matthias Clasen <maclas@gmx.de> * glib/gwin32.c (g_win32_get_package_installation_directory): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 45b6f773a..118da5fe2 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +Tue Jun 11 17:03:39 2002 Owen Taylor <otaylor@redhat.com> + + * tests/patterntest.c (test_compilation) + * glib/gmem.c (profiler_try_realloc): A couple + of 64-bit printf format fix from George Lebl. + + * glib/gconvert.c (open_converter): Fix gsize/gint + mixup for g_iconv() arguments. + 2002-06-03 Matthias Clasen <maclas@gmx.de> * glib/gwin32.c (g_win32_get_package_installation_directory): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 45b6f773a..118da5fe2 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +Tue Jun 11 17:03:39 2002 Owen Taylor <otaylor@redhat.com> + + * tests/patterntest.c (test_compilation) + * glib/gmem.c (profiler_try_realloc): A couple + of 64-bit printf format fix from George Lebl. + + * glib/gconvert.c (open_converter): Fix gsize/gint + mixup for g_iconv() arguments. + 2002-06-03 Matthias Clasen <maclas@gmx.de> * glib/gwin32.c (g_win32_get_package_installation_directory): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 45b6f773a..118da5fe2 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +Tue Jun 11 17:03:39 2002 Owen Taylor <otaylor@redhat.com> + + * tests/patterntest.c (test_compilation) + * glib/gmem.c (profiler_try_realloc): A couple + of 64-bit printf format fix from George Lebl. + + * glib/gconvert.c (open_converter): Fix gsize/gint + mixup for g_iconv() arguments. + 2002-06-03 Matthias Clasen <maclas@gmx.de> * glib/gwin32.c (g_win32_get_package_installation_directory): diff --git a/glib/gconvert.c b/glib/gconvert.c index 63c251f95..2c8d2b7d4 100644 --- a/glib/gconvert.c +++ b/glib/gconvert.c @@ -358,9 +358,9 @@ open_converter (const gchar *to_codeset, * NULL for anything but inbuf; work around that. (NULL outbuf * or NULL *outbuf is allowed by Unix98.) */ - gint inbytes_left = 0; + gsize inbytes_left = 0; gchar *outbuf = NULL; - gint outbytes_left = 0; + gsize outbytes_left = 0; cd = bucket->cd; bucket->used = TRUE; diff --git a/glib/gmem.c b/glib/gmem.c index 5ffe06a80..5d3a13a5c 100644 --- a/glib/gmem.c +++ b/glib/gmem.c @@ -541,7 +541,7 @@ profiler_try_realloc (gpointer mem, if (mem && p[0]) /* free count */ { - g_warning ("realloc(%p, %u): memory has been freed %lu times already", p + 2, n_bytes, p[0]); + g_warning ("realloc(%p, %lu): memory has been freed %lu times already", p + 2, (gulong)n_bytes, p[0]); profiler_log (PROFILER_ALLOC | PROFILER_RELOC, n_bytes, FALSE); return NULL; diff --git a/tests/patterntest.c b/tests/patterntest.c index 2bb77bd45..f1bc0fce8 100644 --- a/tests/patterntest.c +++ b/tests/patterntest.c @@ -105,7 +105,7 @@ test_compilation (gchar *src, { g_print ("failed \t(pattern_length: %d, expected %d)\n", spec->pattern_length, - strlen (spec->pattern)); + (gint)strlen (spec->pattern)); return FALSE; } |