From 0b6eeb2eb4d58af5037ad64c050a552ee7fe15e4 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sun, 14 Mar 2004 04:15:10 +0000 Subject: [PATCH] Some warning fixes for the Sun compiler (Reported by David L. Cooper II, Sat Mar 13 23:10:35 2004 Owen Taylor Some warning fixes for the Sun compiler (Reported by David L. Cooper II, #136401) * glib/giochannel.c (g_io_channel_read): Return G_IO_ERROR_NONE, not G_IO_STATUS_NORMAL, since hte function returns a GIOError. * glib/guniprop.c: Fix some guchar/gchar confusion with special_case_table. --- ChangeLog | 12 ++++++++++++ ChangeLog.pre-2-10 | 12 ++++++++++++ ChangeLog.pre-2-12 | 12 ++++++++++++ ChangeLog.pre-2-4 | 12 ++++++++++++ ChangeLog.pre-2-6 | 12 ++++++++++++ ChangeLog.pre-2-8 | 12 ++++++++++++ glib/giochannel.c | 2 +- glib/guniprop.c | 6 +++--- 8 files changed, 76 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 68b26875b..7ef2f2803 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Sat Mar 13 23:10:35 2004 Owen Taylor + + Some warning fixes for the Sun compiler (Reported by + David L. Cooper II, #136401) + + * glib/giochannel.c (g_io_channel_read): Return + G_IO_ERROR_NONE, not G_IO_STATUS_NORMAL, since hte + function returns a GIOError. + + * glib/guniprop.c: Fix some guchar/gchar confusion + with special_case_table. + Fri Mar 12 15:30:58 2004 Manish Singh * glib/gbacktrace.h: ia32's G_BREAKPOINT() implementation works on diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 68b26875b..7ef2f2803 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,15 @@ +Sat Mar 13 23:10:35 2004 Owen Taylor + + Some warning fixes for the Sun compiler (Reported by + David L. Cooper II, #136401) + + * glib/giochannel.c (g_io_channel_read): Return + G_IO_ERROR_NONE, not G_IO_STATUS_NORMAL, since hte + function returns a GIOError. + + * glib/guniprop.c: Fix some guchar/gchar confusion + with special_case_table. + Fri Mar 12 15:30:58 2004 Manish Singh * glib/gbacktrace.h: ia32's G_BREAKPOINT() implementation works on diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 68b26875b..7ef2f2803 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,15 @@ +Sat Mar 13 23:10:35 2004 Owen Taylor + + Some warning fixes for the Sun compiler (Reported by + David L. Cooper II, #136401) + + * glib/giochannel.c (g_io_channel_read): Return + G_IO_ERROR_NONE, not G_IO_STATUS_NORMAL, since hte + function returns a GIOError. + + * glib/guniprop.c: Fix some guchar/gchar confusion + with special_case_table. + Fri Mar 12 15:30:58 2004 Manish Singh * glib/gbacktrace.h: ia32's G_BREAKPOINT() implementation works on diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 68b26875b..7ef2f2803 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,15 @@ +Sat Mar 13 23:10:35 2004 Owen Taylor + + Some warning fixes for the Sun compiler (Reported by + David L. Cooper II, #136401) + + * glib/giochannel.c (g_io_channel_read): Return + G_IO_ERROR_NONE, not G_IO_STATUS_NORMAL, since hte + function returns a GIOError. + + * glib/guniprop.c: Fix some guchar/gchar confusion + with special_case_table. + Fri Mar 12 15:30:58 2004 Manish Singh * glib/gbacktrace.h: ia32's G_BREAKPOINT() implementation works on diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 68b26875b..7ef2f2803 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,15 @@ +Sat Mar 13 23:10:35 2004 Owen Taylor + + Some warning fixes for the Sun compiler (Reported by + David L. Cooper II, #136401) + + * glib/giochannel.c (g_io_channel_read): Return + G_IO_ERROR_NONE, not G_IO_STATUS_NORMAL, since hte + function returns a GIOError. + + * glib/guniprop.c: Fix some guchar/gchar confusion + with special_case_table. + Fri Mar 12 15:30:58 2004 Manish Singh * glib/gbacktrace.h: ia32's G_BREAKPOINT() implementation works on diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 68b26875b..7ef2f2803 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,15 @@ +Sat Mar 13 23:10:35 2004 Owen Taylor + + Some warning fixes for the Sun compiler (Reported by + David L. Cooper II, #136401) + + * glib/giochannel.c (g_io_channel_read): Return + G_IO_ERROR_NONE, not G_IO_STATUS_NORMAL, since hte + function returns a GIOError. + + * glib/guniprop.c: Fix some guchar/gchar confusion + with special_case_table. + Fri Mar 12 15:30:58 2004 Manish Singh * glib/gbacktrace.h: ia32's G_BREAKPOINT() implementation works on diff --git a/glib/giochannel.c b/glib/giochannel.c index 2f384f354..48b6b66eb 100644 --- a/glib/giochannel.c +++ b/glib/giochannel.c @@ -186,7 +186,7 @@ g_io_channel_read (GIOChannel *channel, { if (bytes_read) *bytes_read = 0; - return G_IO_STATUS_NORMAL; + return G_IO_ERROR_NONE; } g_return_val_if_fail (buf != NULL, G_IO_ERROR_UNKNOWN); diff --git a/glib/guniprop.c b/glib/guniprop.c index 5d4c4f472..54d191eee 100644 --- a/glib/guniprop.c +++ b/glib/guniprop.c @@ -377,7 +377,7 @@ g_unichar_toupper (gunichar c) gunichar val = ATTTABLE (c >> 8, c & 0xff); if (val >= 0x1000000) { - const guchar *p = special_case_table + val - 0x1000000; + const gchar *p = special_case_table + val - 0x1000000; return g_utf8_get_char (p); } else @@ -414,7 +414,7 @@ g_unichar_tolower (gunichar c) gunichar val = ATTTABLE (c >> 8, c & 0xff); if (val >= 0x1000000) { - const guchar *p = special_case_table + val - 0x1000000; + const gchar *p = special_case_table + val - 0x1000000; return g_utf8_get_char (p); } else @@ -578,7 +578,7 @@ output_special_case (gchar *out_buffer, int type, int which) { - const guchar *p = special_case_table + offset; + const gchar *p = special_case_table + offset; gint len; if (type != G_UNICODE_TITLECASE_LETTER)