From 9b593427aab6bb5bd63bd7d657e871c66bf1704a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 17 Nov 2005 14:57:24 +0000 Subject: [PATCH] const correctness fixes found by Arjan van de Ven and gcc. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ contrib/gdk-pixbuf-xlib/ChangeLog | 6 ++++++ contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c | 4 ++-- contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.c | 2 +- modules/engines/pixbuf/ChangeLog | 5 +++++ modules/engines/pixbuf/pixbuf-rc-style.c | 2 +- perf/treeview.c | 2 +- 8 files changed, 26 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8e55301e2..28a729fd6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-11-17 Matthias Clasen + + * perf/treeview.c: const correctness fixes + found by Arjan van de Ven and gcc. + 2005-11-16 Michael Natterer * gtk/gtkimage.c (animation_timeout): call diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 8e55301e2..28a729fd6 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2005-11-17 Matthias Clasen + + * perf/treeview.c: const correctness fixes + found by Arjan van de Ven and gcc. + 2005-11-16 Michael Natterer * gtk/gtkimage.c (animation_timeout): call diff --git a/contrib/gdk-pixbuf-xlib/ChangeLog b/contrib/gdk-pixbuf-xlib/ChangeLog index be68449d5..fbd75fa8b 100644 --- a/contrib/gdk-pixbuf-xlib/ChangeLog +++ b/contrib/gdk-pixbuf-xlib/ChangeLog @@ -1,3 +1,9 @@ +2005-11-17 Matthias Clasen + + * gdk-pixbuf-xlib-drawable.c: + * gdk-pixbuf-xlibrgb.c: const correctness fixes + found by Arjan van de Ven and gcc. + 2005-10-05 Matthias Clasen * gdk-pixbuf-xlib-2.0.pc.in (Requires): Require diff --git a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c index da9dae2f8..38ad9b20b 100644 --- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c +++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c @@ -41,7 +41,7 @@ -static guint32 mask_table[] = { +static const guint32 mask_table[] = { 0x00000000, 0x00000001, 0x00000003, 0x00000007, 0x0000000f, 0x0000001f, 0x0000003f, 0x0000007f, 0x000000ff, 0x000001ff, 0x000003ff, 0x000007ff, @@ -1058,7 +1058,7 @@ convert_real_slow (XImage *image, guchar *pixels, int rowstride, xlib_colormap * typedef void (* cfunc) (XImage *image, guchar *pixels, int rowstride, xlib_colormap *cmap); -static cfunc convert_map[] = { +static const cfunc convert_map[] = { rgb1,rgb1,rgb1a,rgb1a, rgb8,rgb8,rgb8a,rgb8a, rgb555lsb,rgb555msb,rgb555alsb,rgb555amsb, diff --git a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.c b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.c index b5d0f8e3e..701f34a9d 100644 --- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.c +++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.c @@ -516,7 +516,7 @@ static guint32 xlib_rgb_score_visual (XVisualInfo *visual) { guint32 quality, speed, pseudo, sys; - static const char* visual_names[] = + static const char * const visual_names[] = { "static gray", "grayscale", diff --git a/modules/engines/pixbuf/ChangeLog b/modules/engines/pixbuf/ChangeLog index 60b3260eb..fd72931d1 100644 --- a/modules/engines/pixbuf/ChangeLog +++ b/modules/engines/pixbuf/ChangeLog @@ -1,3 +1,8 @@ +2005-11-17 Matthias Clasen + + * pixbuf-rc-style.c: const correctness fixes + found by Arjan van de Ven and gcc. + 2005-08-24 Matthias Clasen * === Released 2.8.2 === diff --git a/modules/engines/pixbuf/pixbuf-rc-style.c b/modules/engines/pixbuf/pixbuf-rc-style.c index ef93363ce..e688927c5 100644 --- a/modules/engines/pixbuf/pixbuf-rc-style.c +++ b/modules/engines/pixbuf/pixbuf-rc-style.c @@ -36,7 +36,7 @@ static GtkStyle *pixbuf_rc_style_create_style (GtkRcStyle *rc_style); static void theme_image_unref (ThemeImage *data); -static struct +static const struct { gchar *name; guint token; diff --git a/perf/treeview.c b/perf/treeview.c index 461a67a37..4c5c2d799 100644 --- a/perf/treeview.c +++ b/perf/treeview.c @@ -7,7 +7,7 @@ struct row_data { char *text2; }; -static struct row_data row_data[] = { +static const struct row_data row_data[] = { { GTK_STOCK_NEW, "First", "Here bygynneth the Book of the tales of Caunterbury." }, { GTK_STOCK_OPEN, "Second", "Whan that Aprille, with hise shoures soote," }, { GTK_STOCK_ABOUT, "Third", "The droghte of March hath perced to the roote" }, -- 2.43.2