Cleanups

diff --git a/ChangeLog b/ChangeLog
index eb41a14351d938a0125eb6742a29f5170397d7fe..a9839f6cd83464b8ae49cb0a727418e458ca0ad1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-08  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkradiobutton.c (gtk_radio_button_focus): Don't 
+       leak a list.  (#360350, Benjamin Berg)
+
+       * Apply a cleanup patch by Kjartan Maraas  (#341812)
+
 2006-10-07  Tor Lillqvist  <tml@novell.com>
 
        * gtk/gtkcalendar.c (gtk_calendar_init): Use the Win32 thread

diff --git a/contrib/gdk-pixbuf-xlib/ChangeLog b/contrib/gdk-pixbuf-xlib/ChangeLog
index 91572c705fa6b7130592b6fbc4d426ae22729f42..69a221046d6df4017020bc2e7f7eaca39b70194c 100644 (file)
--- a/contrib/gdk-pixbuf-xlib/ChangeLog
+++ b/contrib/gdk-pixbuf-xlib/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-08  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk-pixbuf-xlib.c: Apply a cleanup patch by
+       Kjartan Maraas  (#341812)
+
 2006-08-17  Matthias Clasen  <mclasen@redhat.com>
 
        * === Released 2.10.2 ===

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index b72ed39b2f4fb1456b05281cb63028a6bdf9569e..7da70a49f19df056f3ad08d63d2eac84d9ff80e0 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-08  Matthias Clasen  <mclasen@redhat.com>
+
+       * Apply a cleanup patch by Kjartan Maraas  (#341812) 
+
 2006-09-06  Matthias Clasen  <mclasen@redhat.com>
 
        * io-pnm.c: Simplify and fix reading of ASCII images. 

diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c
index 95103ff95f1998bc9f203664ace7db364588c65e..9b83f4b48ac41e86ccc3722321f58748e8ca84d8 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-io.c
+++ b/gdk-pixbuf/gdk-pixbuf-io.c
@@ -123,7 +123,7 @@ _gdk_pixbuf_unlock (GdkPixbufModule *image_module)
 
 static GSList *file_formats = NULL;
 
-static void gdk_pixbuf_io_init ();
+static void gdk_pixbuf_io_init (void);
 
 static GSList *
 get_file_formats (void)
@@ -1138,7 +1138,7 @@ gdk_pixbuf_new_from_file_at_scale (const char *filename,
                
                animation = gdk_pixbuf_loader_get_animation (loader);
                if (animation) {
-                       iter = gdk_pixbuf_animation_get_iter (animation, 0);
+                       iter = gdk_pixbuf_animation_get_iter (animation, NULL);
                        if (!gdk_pixbuf_animation_iter_on_currently_loading_frame (iter)) {
                                has_frame = TRUE;
                        }

diff --git a/gdk-pixbuf/gdk-pixdata.c b/gdk-pixbuf/gdk-pixdata.c
index 024bac9d5f02084230e5f7a86a3756d730a59863..f7be7780ba0c4776e37976a1a92fc42cfa81236f 100644 (file)
--- a/gdk-pixbuf/gdk-pixdata.c
+++ b/gdk-pixbuf/gdk-pixdata.c
@@ -620,7 +620,7 @@ gdk_pixdata_to_csource (GdkPixdata        *pixdata,
                        GdkPixdataDumpType dump_type)
 {
   CSourceData cdata = { 0, };
-  gchar *s_uint_8, *s_uint_32, *s_uint, *s_char, *s_null;
+  gchar *s_uint_8;
   guint bpp, width, height, rowstride;
   gboolean rle_encoded;
   gchar *macro_name;
@@ -670,37 +670,13 @@ gdk_pixdata_to_csource (GdkPixdata        *pixdata,
   cdata.gstring = gstring;
 
   if (!cdata.dump_macros && cdata.dump_gtypes)
-    {
-      s_uint_8 =  "guint8 ";
-      s_uint_32 = "guint32";
-      s_uint =    "guint  ";
-      s_char =    "gchar  ";
-      s_null =    "NULL";
-    }
+    s_uint_8 =  "guint8 ";
   else if (!cdata.dump_macros)
-    {
-      s_uint_8 =  "unsigned char";
-      s_uint_32 = "unsigned int ";
-      s_uint =    "unsigned int ";
-      s_char =    "char         ";
-      s_null =    "(char*) 0";
-    }
+    s_uint_8 =  "unsigned char";
   else if (cdata.dump_macros && cdata.dump_gtypes)
-    {
-      s_uint_8 =  "guint8";
-      s_uint_32 = "guint32";
-      s_uint  =   "guint";
-      s_char =    "gchar";
-      s_null =    "NULL";
-    }
+    s_uint_8 =  "guint8";
   else /* cdata.dump_macros && !cdata.dump_gtypes */
-    {
-      s_uint_8 =  "unsigned char";
-      s_uint_32 = "unsigned int";
-      s_uint =    "unsigned int";
-      s_char =    "char";
-      s_null =    "(char*) 0";
-    }
+    s_uint_8 =  "unsigned char";
 
   /* initial comment
    */

diff --git a/gdk-pixbuf/io-jpeg.c b/gdk-pixbuf/io-jpeg.c
index 96b3453b041695daae5dbc1febafecefe34c9e24..3ec2292b4154270824efc4080a852e9384081cbd 100644 (file)
--- a/gdk-pixbuf/io-jpeg.c
+++ b/gdk-pixbuf/io-jpeg.c
@@ -808,8 +808,6 @@ gdk_pixbuf__jpeg_image_load_increment (gpointer data,
                                continue;
                }
        }
-
-       return TRUE;
 }
 
 /* Save */

diff --git a/gdk-pixbuf/io-pcx.c b/gdk-pixbuf/io-pcx.c
index e6de063161751256ecc2b6383eab364a60f98d4c..e4d375fe7c6b342cce5f54f2c6996ebaf94104ef 100644 (file)
--- a/gdk-pixbuf/io-pcx.c
+++ b/gdk-pixbuf/io-pcx.c
@@ -236,14 +236,12 @@ pcx_chop_context_buf(struct pcx_context *context, guint size)
 {
        guint i, j;
 
-       if(size > context->buf_pos)
+       if (size > context->buf_pos)
                return FALSE;
-       else if(size < 0)
-               return FALSE;
-       else if(size == 0)
+       else if (size == 0)
                return TRUE;
 
-       for(i = 0, j = size; j < context->buf_pos; i++, j++)
+       for (i = 0, j = size; j < context->buf_pos; i++, j++)
                context->buf[i] = context->buf[j];
 
        context->buf_pos -= size;
@@ -629,7 +627,7 @@ gdk_pixbuf__pcx_load_increment(gpointer data, const guchar *buf, guint size,
                                case 4:
                                case 8:
                                        if(context->num_planes != 1) {
-                                               g_set_error(error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_UNKNOWN_TYPE, _("Image has unsupported number of %d-bit planes"), context->bpp);
+                                         g_set_error(error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_UNKNOWN_TYPE, _("Image has unsupported number of %d-bit planes"), (gint)context->bpp);
                                                return FALSE;
                                        }
                                        break;

diff --git a/gdk-pixbuf/io-png.c b/gdk-pixbuf/io-png.c
index f662c07da1633ef0559b9d1c33a42ce8477e3f06..f6b1bc1edefafebdc3600470de7a38ceb67cbe06 100644 (file)
--- a/gdk-pixbuf/io-png.c
+++ b/gdk-pixbuf/io-png.c
@@ -660,7 +660,7 @@ png_row_callback   (png_structp png_read_ptr,
         if (lc->fatal_error_occurred)
                 return;
 
-        if (row_num < 0 || row_num >= lc->pixbuf->height) {
+        if (row_num >= lc->pixbuf->height) {
                 lc->fatal_error_occurred = TRUE;
                 if (lc->error && *lc->error == NULL) {
                         g_set_error (lc->error,

diff --git a/gdk-pixbuf/io-pnm.c b/gdk-pixbuf/io-pnm.c
index 08489ef9882b5f3f8043735566a78b9ae9fa719f..efba937444f0a3d6ea41e4ab3c9f69fc4423aa98 100644 (file)
--- a/gdk-pixbuf/io-pnm.c
+++ b/gdk-pixbuf/io-pnm.c
@@ -108,19 +108,17 @@ explode_bitmap_into_buf (PnmLoaderContext *context)
        guchar *from, *to, data;
        gint bit;
        guchar *dptr;
-       gint wid, x, y;
+       gint wid, x;
        
        g_return_if_fail (context != NULL);
        g_return_if_fail (context->dptr != NULL);
        
        /* I'm no clever bit-hacker so I'm sure this can be optimized */
        dptr = context->dptr;
-       y    = context->output_row;
        wid  = context->width;
        
        from = dptr + ((wid - 1) / 8);
        to   = dptr + (wid - 1) * 3;
-/*     bit  = 7 - (((y+1)*wid-1) % 8); */
        bit  = 7 - ((wid-1) % 8);
        
        /* get first byte and align properly */
@@ -892,8 +890,6 @@ gdk_pixbuf__pnm_image_load_increment (gpointer data,
 {
        PnmLoaderContext *context = (PnmLoaderContext *)data;
        PnmIOBuffer *inbuf;
-       guchar *old_byte;
-       guint old_nbytes;
        const guchar *bufhd;
        guint num_left, spinguard;
        gint retval;
@@ -905,8 +901,6 @@ gdk_pixbuf__pnm_image_load_increment (gpointer data,
        
        bufhd = buf;
        inbuf = &context->inbuf;
-       old_nbytes = inbuf->nbytes;
-       old_byte  = inbuf->byte;
        
        num_left = size;
        spinguard = 0;

diff --git a/gdk-pixbuf/io-tiff.c b/gdk-pixbuf/io-tiff.c
index d8502433213dce09525c70dba6a9b4070080079a..455d3691d7f953577c14d48eee504ec4ce9bd862 100644 (file)
--- a/gdk-pixbuf/io-tiff.c
+++ b/gdk-pixbuf/io-tiff.c
@@ -430,7 +430,7 @@ tiff_load_seek (thandle_t handle, toff_t offset, int whence)
         
         switch (whence) {
         case SEEK_SET:
-                if (offset > context->used || offset < 0)
+                if (offset > context->used)
                         return -1;
                 context->pos = offset;
                 break;
@@ -446,7 +446,6 @@ tiff_load_seek (thandle_t handle, toff_t offset, int whence)
                 break;
         default:
                 return -1;
-                break;
         }
         return context->pos;
 }
@@ -622,8 +621,6 @@ tiff_save_seek (thandle_t handle, toff_t offset, int whence)
 
         switch (whence) {
         case SEEK_SET:
-                if (offset < 0)
-                        return -1;
                 context->pos = offset;
                 break;
         case SEEK_CUR:
@@ -634,7 +631,6 @@ tiff_save_seek (thandle_t handle, toff_t offset, int whence)
                 break;
         default:
                 return -1;
-                break;
         }
         return context->pos;
 }

diff --git a/gdk-pixbuf/io-wbmp.c b/gdk-pixbuf/io-wbmp.c
index 24779b97e22d459df456d04e61a3066a7d708355..94a6f61e11e1a154c978211a15c6b04700cd6234 100644 (file)
--- a/gdk-pixbuf/io-wbmp.c
+++ b/gdk-pixbuf/io-wbmp.c
@@ -166,7 +166,7 @@ static gboolean
 get_mbi(struct wbmp_progressive_state *context, const guchar **buf, guint *buf_size, int *val)
 {
   guchar intbuf[16];
-  int i, n;
+  int n;
   gboolean rv;
 
   *val = 0;

diff --git a/gdk-pixbuf/pixops/timescale.c b/gdk-pixbuf/pixops/timescale.c
index 945cf8003e3562ebdbddfa8c7243429a3fb64525..b02bc3e31ff0089933f3f073d85dd4856f2c7677 100644 (file)
--- a/gdk-pixbuf/pixops/timescale.c
+++ b/gdk-pixbuf/pixops/timescale.c
@@ -26,12 +26,13 @@
 
 static GTimeVal start_time;
 
-void start_timing (void)
+static void 
+start_timing (void)
 {
   g_get_current_time (&start_time);
 }
 
-double
+static double
 stop_timing (const char *test, int iterations, int bytes)
 {
   GTimeVal stop_time;
@@ -53,7 +54,7 @@ stop_timing (const char *test, int iterations, int bytes)
   return ((double)bytes * iterations) / (1000*msecs);
 }
 
-void
+static void
 init_array (double times[3][3][4])
 {
   int i, j, k;
@@ -64,7 +65,7 @@ init_array (double times[3][3][4])
        times[i][j][k] = -1;
 }
 
-void
+static void
 dump_array (double times[3][3][4])
 {
   int i, j;

diff --git a/gdk-pixbuf/queryloaders.c b/gdk-pixbuf/queryloaders.c
index bec11f0d2489cc32c3defe9bd4d4e0bf0e0e3663..11be6036ca7dc492a7043775ba3288eda7eebb9d 100644 (file)
--- a/gdk-pixbuf/queryloaders.c
+++ b/gdk-pixbuf/queryloaders.c
@@ -38,7 +38,7 @@
 #include "gdk-pixbuf/gdk-pixbuf-private.h"
 #include "gdk-pixbuf/gdk-pixbuf-io.h"
 
-#if USE_LA_MODULES
+#ifdef USE_LA_MODULES
 #define SOEXT ".la"
 #else
 #define SOEXT ("." G_MODULE_SUFFIX)

diff --git a/gdk/gdkgc.c b/gdk/gdkgc.c
index 0e03ae29131ee4d3476b274b5fd0411996449e94..ec53dec702f340d3ad35aca1ccb358516006977f 100644 (file)
--- a/gdk/gdkgc.c
+++ b/gdk/gdkgc.c
@@ -279,7 +279,6 @@ gdk_gc_set_values (GdkGC           *gc,
     gc->ts_y_origin = values->ts_y_origin;
   if (values_mask & GDK_GC_CLIP_MASK)
     {
-      GdkGCPrivate *priv = GDK_GC_GET_PRIVATE (gc);
       if (priv->clip_region)
        {
          gdk_region_destroy (priv->clip_region);

diff --git a/gdk/gdkregion-generic.c b/gdk/gdkregion-generic.c
index 57c6aa3c751f6414b953781dc7047df0b548afaf..71030d7c685aa605f015a95f12981e74ff18c349 100644 (file)
--- a/gdk/gdkregion-generic.c
+++ b/gdk/gdkregion-generic.c
@@ -105,7 +105,7 @@ static void miRegionOp   (GdkRegion      *newReg,
  * Returns: a new empty #GdkRegion
  */
 GdkRegion *
-gdk_region_new ()
+gdk_region_new (void)
 {
   GdkRegion *temp;
 

diff --git a/gdk/gdkrgb.c b/gdk/gdkrgb.c
index d6e481f8504e0a0cfb7f978b3a564d74128c6433..9380b88858fc6769653fba7ba40a1bb40489f20c 100644 (file)
--- a/gdk/gdkrgb.c
+++ b/gdk/gdkrgb.c
@@ -485,7 +485,7 @@ gdk_rgb_set_gray_cmap (GdkRgbInfo  *image_info,
 {
   gint i;
   GdkColor color;
-  gint status;
+  gboolean status;
   gulong pixels[256];
   gint r, g, b, gray;
 

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 048b3d59d7bb155ca85ffc65f51ae01bd813441e..e3201c45b2e06efef903118f5783dbf4ab09ca4a 100644 (file)
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -30,7 +30,6 @@
 #include "gdk.h"               /* For gdk_rectangle_union() */
 #include "gdkpixmap.h"
 #include "gdkdrawable.h"
-#include "gdkpixmap.h"
 #include "gdkscreen.h"
 #include "gdkalias.h"
 

diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
index 47178f2584964be02e34982091c1f1632a65c46b..f9104313301fb46ca04589f8387c93cfef2aa60b 100644 (file)
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@@ -130,7 +130,7 @@ static void gdk_drag_context_finalize   (GObject              *object);
 
 static GList *contexts;
 
-const static struct {
+static const struct {
   const char *atom_name;
   GdkFilterFunc func;
 } xdnd_filters[] = {

diff --git a/gdk/x11/gdkim-x11.c b/gdk/x11/gdkim-x11.c
index 028befb4d8af73f4454bce4621a421547f9561d0..b3044432d6a4a07dba958d7d894f2ca8be179ce2 100644 (file)
--- a/gdk/x11/gdkim-x11.c
+++ b/gdk/x11/gdkim-x11.c
@@ -32,7 +32,6 @@
 
 #include "gdkx.h"
 #include "gdk.h"               /* For gdk_flush() */
-#include "gdkx.h"
 #include "gdkpixmap.h"
 #include "gdkinternals.h"
 #include "gdkdisplay-x11.h"

diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index f97e0dba21dd3980793ffbf24ac1005a74b23b1f..d8bffba951ba3198d1eda100f2e69999aef08c8c 100644 (file)
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -1577,7 +1577,6 @@ gdk_window_hide (GdkWindow *window)
     case GDK_WINDOW_TEMP: /* ? */
       gdk_window_withdraw (window);
       return;
-      break;
       
     case GDK_WINDOW_FOREIGN:
     case GDK_WINDOW_ROOT:
@@ -5737,7 +5736,6 @@ wmspec_resize_drag (GdkWindow     *window,
       g_warning ("gdk_window_begin_resize_drag: bad resize edge %d!",
                  edge);
       return;
-      break;
     }
   
   wmspec_moveresize (window, direction, root_x, root_y, timestamp);

diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c
index cac8a94954754382a6e3fa6c8244196d24ef7d7a..d1d7f4fe931462e30a557a4057d1e07eece6d0d6 100644 (file)
--- a/gtk/gtkradiobutton.c
+++ b/gtk/gtkradiobutton.c
@@ -449,8 +449,6 @@ gtk_radio_button_focus (GtkWidget         *widget,
       GtkWidget *toplevel = gtk_widget_get_toplevel (widget);
       GtkWidget *new_focus = NULL;
 
-      focus_list = g_slist_copy (radio_button->group);
-      
       switch (direction)
        {
        case GTK_DIR_TAB_FORWARD:
@@ -458,10 +456,12 @@ gtk_radio_button_focus (GtkWidget         *widget,
          return FALSE;
        case GTK_DIR_LEFT:
        case GTK_DIR_RIGHT:
+         focus_list = g_slist_copy (radio_button->group);
          focus_list = g_slist_sort_with_data (focus_list, left_right_compare, toplevel);
          break;
        case GTK_DIR_UP:
        case GTK_DIR_DOWN:
+         focus_list = g_slist_copy (radio_button->group);
          focus_list = g_slist_sort_with_data (focus_list, up_down_compare, toplevel);
          break;
        }

diff --git a/gtk/gtksocket-x11.c b/gtk/gtksocket-x11.c
index 9554d67ffcc0b50618f9688aa27354895e4171ed..25fe9c914c1b334be275beb270b916db31c0773d 100644 (file)
--- a/gtk/gtksocket-x11.c
+++ b/gtk/gtksocket-x11.c
@@ -29,7 +29,6 @@
 #include <string.h>
 
 #include "gdk/gdkkeysyms.h"
-#include "gtkalias.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkwindow.h"

diff --git a/modules/engines/pixbuf/ChangeLog b/modules/engines/pixbuf/ChangeLog
index 3fde312af6468bc3168265ea29f201ff28e603ba..56b234c5d19b5f333ee1afcb70badf797139d543 100644 (file)
--- a/modules/engines/pixbuf/ChangeLog
+++ b/modules/engines/pixbuf/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-08  Matthias Clasen  <mclasen@redhat.com>
+
+       * pixbuf-draw.c: Apply a cleanup patch by 
+       Kjartan Maraas  (#341812)
+
 2006-08-17  Matthias Clasen  <mclasen@redhat.com>
 
        * === Released 2.10.2 ===

diff --git a/modules/engines/pixbuf/pixbuf-draw.c b/modules/engines/pixbuf/pixbuf-draw.c
index a4dd50cf4c1af0a5a1531d3ac86f35c281e23573..dec14e5be155547b25755da88d52aea069989106 100644 (file)
--- a/modules/engines/pixbuf/pixbuf-draw.c
+++ b/modules/engines/pixbuf/pixbuf-draw.c
@@ -109,14 +109,9 @@ draw_simple_image(GtkStyle       *style,
                  gint            height)
 {
   ThemeImage *image;
-  gboolean setbg = FALSE;
   
   if ((width == -1) && (height == -1))
-    {
-      gdk_drawable_get_size(window, &width, &height);
-      if (allow_setbg)
-       setbg = TRUE;
-    }
+    gdk_drawable_get_size(window, &width, &height);
   else if (width == -1)
     gdk_drawable_get_size(window, &width, NULL);
   else if (height == -1)
@@ -172,13 +167,9 @@ draw_gap_image(GtkStyle       *style,
               gint            gap_width)
 {
   ThemeImage *image;
-  gboolean setbg = FALSE;
   
   if ((width == -1) && (height == -1))
-    {
-      gdk_drawable_get_size(window, &width, &height);
-      setbg = TRUE;
-    }
+    gdk_drawable_get_size(window, &width, &height);
   else if (width == -1)
     gdk_drawable_get_size(window, &width, NULL);
   else if (height == -1)

diff --git a/modules/input/gtkimcontextxim.c b/modules/input/gtkimcontextxim.c
index 40c8d31c177a677eae5f5ca91401ec8aa5e18f9d..68f6ec4f9d91abf6e0d36c0efaf0d3b892b80a78 100644 (file)
--- a/modules/input/gtkimcontextxim.c
+++ b/modules/input/gtkimcontextxim.c
@@ -147,7 +147,7 @@ static GObjectClass *parent_class;
 
 GType gtk_type_im_context_xim = 0;
 
-GSList *open_ims = NULL;
+static GSList *open_ims = NULL;
 
 /* List of status windows for different toplevels */
 static GSList *status_windows = NULL;

diff --git a/perf/gtkwidgetprofiler.h b/perf/gtkwidgetprofiler.h
index 4a96b9ffd813b53570806126f81a8db2a13106dc..59c478894395843f1ed2249a7c224b93dd55547e 100644 (file)
--- a/perf/gtkwidgetprofiler.h
+++ b/perf/gtkwidgetprofiler.h
@@ -45,7 +45,7 @@ struct _GtkWidgetProfilerClass {
 
 GType gtk_widget_profiler_get_type (void) G_GNUC_CONST;
 
-GtkWidgetProfiler *gtk_widget_profiler_new ();
+GtkWidgetProfiler *gtk_widget_profiler_new (void);
 
 void gtk_widget_profiler_set_num_iterations (GtkWidgetProfiler *profiler,
                                             gint               n_iterations);