GNOME.org
 

[dia] [warningectomy] variable set but not used

commit e53febac62683f078ac6d5a08e2b46b74df71dd1
Author: Hans Breuer <hans breuer org>
Date:   Fri May 3 20:15:25 2013 +0200

    [warningectomy] variable set but not used
    
    only the easy stuff, no API changes

 app/layer_dialog.c                     |    7 ----
 app/preferences.c                      |    2 +
 app/toolbox.c                          |    2 -
 lib/diagramdata.c                      |    1 -
 lib/dialinestyleselector.c             |   49 ++++++++-----------------------
 lib/diapathrenderer.c                  |    4 +--
 lib/diarenderer.c                      |    2 -
 lib/prop_pixbuf.c                      |    2 -
 lib/widgets.c                          |    4 --
 objects/KAOS/metaandorrel.c            |    4 +--
 objects/UML/lifeline.c                 |    6 +--
 plug-ins/dxf/dxf-import.c              |    2 +-
 plug-ins/postscript/diapsft2renderer.c |    2 -
 plug-ins/postscript/diapsrenderer.c    |    3 --
 plug-ins/pstricks/render_pstricks.c    |    5 ---
 plug-ins/python/pydia-diagram.c        |    5 ++-
 plug-ins/python/pydia-diagramdata.c    |    3 +-
 plug-ins/python/pydia-render.c         |    3 --
 plug-ins/vdx/vdx-xml.c                 |    1 +
 plug-ins/xfig/xfig-import.c            |    2 -
 20 files changed, 26 insertions(+), 83 deletions(-)
---
diff --git a/app/layer_dialog.c b/app/layer_dialog.c
index d0f92f6..94417a1 100644
--- a/app/layer_dialog.c
+++ b/app/layer_dialog.c
@@ -229,7 +229,6 @@ layer_list_events (GtkWidget *widget,
                   GdkEvent  *event)
 {
   GdkEventKey *kevent;
-  GdkEventButton *bevent;
   GtkWidget *event_widget;
   DiaLayerWidget *layer_widget;
 
@@ -239,12 +238,7 @@ layer_list_events (GtkWidget *widget,
     layer_widget = DIA_LAYER_WIDGET(event_widget);
 
     switch (event->type) {
-    case GDK_BUTTON_PRESS:
-      bevent = (GdkEventButton *) event;
-      break;
-
     case GDK_2BUTTON_PRESS:
-      bevent = (GdkEventButton *) event;
       layer_dialog_edit_layer(layer_widget, NULL, NULL);
       return TRUE;
 
@@ -853,7 +847,6 @@ dia_layer_widget_unrealize(GtkWidget *widget)
 static void
 dia_layer_widget_class_init(DiaLayerWidgetClass *klass)
 {
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
   widget_class->unrealize = dia_layer_widget_unrealize;
diff --git a/app/preferences.c b/app/preferences.c
index 3e55195..90938ad 100644
--- a/app/preferences.c
+++ b/app/preferences.c
@@ -750,11 +750,13 @@ prefs_update_dialog_from_prefs(void)
 static void
 update_internal_prefs(DiaPrefData *pref, gpointer ptr)
 {
+#if 0
   char *val = NULL;
   
   if (!ptr)
     return;
   val = *(char **)ptr;
+#endif
   if (prefs.length_unit)
     prefs_set_length_unit(prefs.length_unit);
   if (prefs.fontsize_unit)
diff --git a/app/toolbox.c b/app/toolbox.c
index 69ed0db..6d36fa2 100644
--- a/app/toolbox.c
+++ b/app/toolbox.c
@@ -248,7 +248,6 @@ static void
 fill_sheet_wbox(Sheet *sheet)
 {
   int rows;
-  GtkStyle *style;
   GSList *tmp;
   GtkWidget *first_button = NULL;
 
@@ -264,7 +263,6 @@ fill_sheet_wbox(Sheet *sheet)
   if (rows<1) rows = 1;
   gtk_wrap_box_set_aspect_ratio(GTK_WRAP_BOX(sheet_wbox),
                                COLUMNS * 1.0 / rows);
-  style = gtk_widget_get_style(sheet_wbox);
   for (tmp = sheet->objects; tmp != NULL; tmp = tmp->next) {
     SheetObject *sheet_obj = tmp->data;
     GdkPixbuf *pixbuf = NULL;
diff --git a/lib/diagramdata.c b/lib/diagramdata.c
index a384f05..313a757 100644
--- a/lib/diagramdata.c
+++ b/lib/diagramdata.c
@@ -841,7 +841,6 @@ data_render_paginated (DiagramData *data, DiaRenderer *renderer, gpointer user_d
   gdouble width, height;
   gdouble x, y, initx, inity;
   gint xpos, ypos;
-  guint nobjs = 0;
 
   /* the usable area of the page */
   width = data->paper.width;
diff --git a/lib/dialinestyleselector.c b/lib/dialinestyleselector.c
index f58b5d4..4c6c479 100644
--- a/lib/dialinestyleselector.c
+++ b/lib/dialinestyleselector.c
@@ -94,25 +94,33 @@ static void
 dia_line_style_selector_init (DiaLineStyleSelector *fs)
 {
   GtkWidget *menu;
-  GtkWidget *submenu;
   GtkWidget *menuitem, *ln;
   GtkWidget *label;
   GtkWidget *length;
   GtkWidget *box;
-  GSList *group;
   GtkAdjustment *adj;
   gint i;
-  
+  static const gchar *_line_style_names[LINESTYLE_DOTTED+1];
+  static gboolean once = FALSE;
+
+  if (!once) {
+    _line_style_names[LINESTYLE_SOLID]        = Q_("line|Solid");
+    _line_style_names[LINESTYLE_DASHED]       = Q_("line|Dashed");
+    _line_style_names[LINESTYLE_DASH_DOT]     = Q_("line|Dash-Dot");
+    _line_style_names[LINESTYLE_DASH_DOT_DOT] = Q_("line|Dash-Dot-Dot");
+    _line_style_names[LINESTYLE_DOTTED]       = Q_("line|Dotted");
+    once = TRUE;
+  }
+
   menu = gtk_option_menu_new();
   fs->omenu = GTK_OPTION_MENU(menu);
 
   menu = gtk_menu_new ();
   fs->linestyle_menu = GTK_MENU(menu);
-  submenu = NULL;
-  group = NULL;
 
   for (i = 0; i <= LINESTYLE_DOTTED; i++) {
     menuitem = gtk_menu_item_new();
+    gtk_widget_set_tooltip_text(menuitem, _line_style_names[i]);
     g_object_set_data(G_OBJECT(menuitem), "user_data", GINT_TO_POINTER(i));
     ln = dia_line_preview_new(i);
     gtk_container_add(GTK_CONTAINER(menuitem), ln);
@@ -120,37 +128,6 @@ dia_line_style_selector_init (DiaLineStyleSelector *fs)
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
     gtk_widget_show(menuitem);
   }
-#if 0
-  menuitem = gtk_radio_menu_item_new_with_label (group, Q_("line|Solid"));
-  g_object_set_data(G_OBJECT(menuitem), "user_data", GINT_TO_POINTER(LINESTYLE_SOLID));
-  group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-  gtk_widget_show (menuitem);
-
-  menuitem = gtk_radio_menu_item_new_with_label (group, Q_("line|Dashed"));
-  g_object_set_data(G_OBJECT(menuitem), "user_data", GINT_TO_POINTER(LINESTYLE_DASHED));
-  group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-  gtk_widget_show (menuitem);
-
-  menuitem = gtk_radio_menu_item_new_with_label (group, Q_("line|Dash-Dot"));
-  g_object_set_data(G_OBJECT(menuitem), "user_data", GINT_TO_POINTER(LINESTYLE_DASH_DOT));
-  group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-  gtk_widget_show (menuitem);
-
-  menuitem = gtk_radio_menu_item_new_with_label (group, Q_("line|Dash-Dot-Dot"));
-  g_object_set_data(G_OBJECT(menuitem), "user_data", GINT_TO_POINTER(LINESTYLE_DASH_DOT_DOT));
-  group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-  gtk_widget_show (menuitem);
-  
-  menuitem = gtk_radio_menu_item_new_with_label (group, Q_("line|Dotted"));
-  g_object_set_data(G_OBJECT(menuitem), "user_data", GINT_TO_POINTER(LINESTYLE_DOTTED));
-  group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-  gtk_widget_show (menuitem);
-#endif
   
   gtk_menu_set_active(GTK_MENU (menu), DEFAULT_LINESTYLE);
   gtk_option_menu_set_menu (GTK_OPTION_MENU (fs->omenu), menu);
diff --git a/lib/diapathrenderer.c b/lib/diapathrenderer.c
index eb595a2..04331b2 100644
--- a/lib/diapathrenderer.c
+++ b/lib/diapathrenderer.c
@@ -343,7 +343,7 @@ _arc (DiaRenderer *self,
 {
   DiaPathRenderer *renderer = DIA_PATH_RENDERER (self);
   GArray *path = _get_current_path (renderer, stroke, fill);
-  Point start, end;
+  Point start;
   real radius = sqrt(width * height) / 2.0;
   real ar1 = (M_PI / 180.0) * angle1;
   real ar2 = (M_PI / 180.0) * angle2;
@@ -357,8 +357,6 @@ _arc (DiaRenderer *self,
   /* move to start point */
   start.x = center->x + (width / 2.0)  * cos(ar1);  
   start.y = center->y - (height / 2.0) * sin(ar1);
-  end.x = center->x + (width / 2.0)  * cos(ar2);  
-  end.y = center->y - (height / 2.0) * sin(ar2);
   /* Dia and Cairo don't agree on arc definitions, so it needs
    * to be converted, i.e. mirrored at the x axis
    */
diff --git a/lib/diarenderer.c b/lib/diarenderer.c
index 2e418ab..642bb6a 100644
--- a/lib/diarenderer.c
+++ b/lib/diarenderer.c
@@ -1318,7 +1318,6 @@ draw_arc_with_arrows (DiaRenderer *renderer,
   Point start_arrow_end;
   Point end_arrow_head;
   Point end_arrow_end;
-  gboolean clockwise; /* calculated from angles */
 
   if (!find_center_point(&center, startpoint, endpoint, midpoint)) {
     /* Degenerate circle -- should have been caught by the drawer? */
@@ -1336,7 +1335,6 @@ draw_arc_with_arrows (DiaRenderer *renderer,
     angle1 = angle2;
     angle2 = tmp;
   }
-  clockwise = (angle2 > angle1);
 
   width = 2*distance_point_point(&center, startpoint);
 
diff --git a/lib/prop_pixbuf.c b/lib/prop_pixbuf.c
index 62f1e03..2402365 100644
--- a/lib/prop_pixbuf.c
+++ b/lib/prop_pixbuf.c
@@ -174,11 +174,9 @@ _pixbuf_encode (const gchar *buf,
                gpointer data)
 {
   EncodeData *ed = data;
-  guint old_len;
   gsize growth = (count / 3 + 1) * 4 + 4 + ((count / 3 + 1) * 4 + 4) / 72 + 1;
   gchar *out;
 
-  old_len = ed->array->len;
   g_byte_array_set_size (ed->array, ed->size + growth);
   out = (gchar *)&ed->array->data[ed->size];
   ed->size += g_base64_encode_step ((guchar *)buf, count, TRUE, 
diff --git a/lib/widgets.c b/lib/widgets.c
index be87beb..d146763 100644
--- a/lib/widgets.c
+++ b/lib/widgets.c
@@ -66,10 +66,6 @@ static guint dss_signals[DSS_LAST_SIGNAL] = { 0 };
 static void
 dia_size_selector_class_init (DiaSizeSelectorClass *class)
 {
-  GtkWidgetClass *widget_class;
-  
-  widget_class = (GtkWidgetClass*) class;
-
   dss_signals[DSS_VALUE_CHANGED]
       = g_signal_new("value-changed",
                     G_TYPE_FROM_CLASS(class),
diff --git a/objects/KAOS/metaandorrel.c b/objects/KAOS/metaandorrel.c
index 21a4d3d..2216428 100644
--- a/objects/KAOS/metaandorrel.c
+++ b/objects/KAOS/metaandorrel.c
@@ -420,7 +420,7 @@ static void
 maor_draw(Maor *maor, DiaRenderer *renderer)
 {
   DiaRendererClass *renderer_ops = DIA_RENDERER_GET_CLASS (renderer);
-  Point *endpoints, p1, p2, pm;
+  Point *endpoints, p1, p2;
   Arrow arrow;
   BezPoint bpl[6];
   Point pl[7];
@@ -440,8 +440,6 @@ maor_draw(Maor *maor, DiaRenderer *renderer)
   /* some computations */
   p1 = endpoints[0];     /* could reverse direction here */
   p2 = endpoints[1];
-  pm.x=(p1.x+p2.x)/2;
-  pm.y=(p1.y+p2.y)/2;
 
   /** drawing directed line **/
   renderer_ops->set_linewidth(renderer, MAOR_WIDTH);
diff --git a/objects/UML/lifeline.c b/objects/UML/lifeline.c
index 92060d2..f3c5a29 100644
--- a/objects/UML/lifeline.c
+++ b/objects/UML/lifeline.c
@@ -283,9 +283,9 @@ lifeline_move_handle(Lifeline *lifeline, Handle *handle,
     dy = to->y - conn->endpoints[0].y;
     if (dy > lifeline_rect_size(lifeline)) {
       real dist = dy - lifeline->rbot;
-      real di, df;
+      real di;
       
-      df = modf (dist, &di);
+      modf (dist, &di);
       /* the integer part gives the number of points to add or remove */
       if (fabs (di) > 0) {
         int ni = (int)di;
@@ -741,10 +741,8 @@ lifeline_update_data(Lifeline *lifeline)
 static DiaObject *
 lifeline_load(ObjectNode obj_node, int version,DiaContext *ctx)
 {
-  Lifeline *lifeline;
   DiaObject *obj = object_load_using_properties(&lifeline_type,
                                                 obj_node,version,ctx);
 
-  lifeline = (Lifeline*)obj;
   return obj;
 }
diff --git a/plug-ins/dxf/dxf-import.c b/plug-ins/dxf/dxf-import.c
index 490716e..77f82b6 100644
--- a/plug-ins/dxf/dxf-import.c
+++ b/plug-ins/dxf/dxf-import.c
@@ -1039,7 +1039,7 @@ read_entitiy_lengthunit_dxf(FILE *filedxf, DxfData *data, DiagramData *dia)
          * 4 = Architectural; 5 = Fractional; 6 = Windows desktop 
         */
        e = atoi(data->value);
-       g_message("LengthUnit: %f", coord_scale );
+       g_message("LengthUnit: %f:%f", e, coord_scale );
        break;
       
       default:
diff --git a/plug-ins/postscript/diapsft2renderer.c b/plug-ins/postscript/diapsft2renderer.c
index f92a2ba..63aac74 100644
--- a/plug-ins/postscript/diapsft2renderer.c
+++ b/plug-ins/postscript/diapsft2renderer.c
@@ -219,7 +219,6 @@ void postscript_draw_contour(DiaPsRenderer *renderer,
     PangoAnalysis *analysis = &item->analysis;
     PangoFont *font = analysis->font;
     FT_Face ft_face;
-    int bidi_level;
     int num_glyphs;
     int glyph_idx;
 
@@ -242,7 +241,6 @@ void postscript_draw_contour(DiaPsRenderer *renderer,
       dia_font_get_family(renderer->current_font));
     */
 
-    bidi_level = item->analysis.level;
     num_glyphs = glyphs->num_glyphs;
       
     for (glyph_idx=0; glyph_idx<num_glyphs; glyph_idx++)
diff --git a/plug-ins/postscript/diapsrenderer.c b/plug-ins/postscript/diapsrenderer.c
index cd098d0..74748e8 100644
--- a/plug-ins/postscript/diapsrenderer.c
+++ b/plug-ins/postscript/diapsrenderer.c
@@ -703,7 +703,6 @@ draw_image(DiaRenderer *self,
   DiaPsRenderer *renderer = DIA_PS_RENDERER(self);
   int img_width, img_height, img_rowstride;
   int x, y;
-  real ratio;
   guint8 *rgb_data;
   guint8 *mask_data;
   gchar d1_buf[DTOSTR_BUF_SIZE];
@@ -720,8 +719,6 @@ draw_image(DiaRenderer *self,
   }
   mask_data = dia_image_mask_data(image);
 
-  ratio = height/width;
-
   fprintf(renderer->file, "gs\n");
 
   /* color output only */
diff --git a/plug-ins/pstricks/render_pstricks.c b/plug-ins/pstricks/render_pstricks.c
index 27148d9..47876f7 100644
--- a/plug-ins/pstricks/render_pstricks.c
+++ b/plug-ins/pstricks/render_pstricks.c
@@ -807,7 +807,6 @@ draw_image(DiaRenderer *self,
     int v;
     int                 x, y;
     unsigned char      *ptr;
-    real ratio;
     guint8 *rgb_data;
     gdouble points_in_inch = POINTS_in_INCH;
     gchar points_in_inch_buf[DTOSTR_BUF_SIZE];
@@ -826,7 +825,6 @@ draw_image(DiaRenderer *self,
         dia_context_add_message(renderer->ctx, _("Not enough memory for image drawing."));
         return;
     }
-    ratio = height/width;
 
     fprintf(renderer->file, "\\pscustom{\\code{gsave\n");
     if (1) { /* Color output */
@@ -902,7 +900,6 @@ export_pstricks(DiagramData *data, DiaContext *ctx,
     PstricksRenderer *renderer;
     FILE *file;
     time_t time_now;
-    double scale;
     Rectangle *extent;
     const char *name;
     gchar el_buf[DTOSTR_BUF_SIZE];
@@ -935,8 +932,6 @@ export_pstricks(DiagramData *data, DiaContext *ctx,
     time_now  = time(NULL);
     extent = &data->extents;
   
-    scale = POINTS_in_INCH * data->paper.scaling;
-  
     name = g_get_user_name();
   
     fprintf(file,
diff --git a/plug-ins/python/pydia-diagram.c b/plug-ins/python/pydia-diagram.c
index b79fe42..93f2bb3 100644
--- a/plug-ins/python/pydia-diagram.c
+++ b/plug-ins/python/pydia-diagram.c
@@ -29,6 +29,7 @@
 #include "pydia-cpoint.h"
 #include "pydia-geometry.h"
 #include "pydia-color.h"
+#include "pydia-error.h"
 
 #include <structmember.h> /* PyMemberDef */
 
@@ -366,7 +367,7 @@ PyDiaDiagram_CallbackRemoved(Diagram *dia,void *user_data)
     arg = Py_BuildValue ("(O)", diaobj);
     if (arg) {
       res = PyEval_CallObject (func, arg);
-      /*ON_RES(res, TRUE);*/
+      ON_RES(res, FALSE);
     }
     Py_XDECREF (arg);
 
@@ -412,7 +413,7 @@ PyDiaDiagram_CallbackSelectionChanged(Diagram *dia,int sel,void *user_data)
     arg = Py_BuildValue ("(Oi)", dgm,sel);
     if (arg) {
       res = PyEval_CallObject (func, arg);
-      /*ON_RES(res, TRUE);*/
+      ON_RES(res, FALSE);
     }
     Py_XDECREF (arg);
 
diff --git a/plug-ins/python/pydia-diagramdata.c b/plug-ins/python/pydia-diagramdata.c
index ffa63cc..d8de53e 100644
--- a/plug-ins/python/pydia-diagramdata.c
+++ b/plug-ins/python/pydia-diagramdata.c
@@ -27,6 +27,7 @@
 #include "pydia-layer.h"
 #include "pydia-color.h"
 #include "pydia-paperinfo.h"
+#include "pydia-error.h"
 
 #include <structmember.h> /* PyMemberDef */
 
@@ -237,7 +238,7 @@ PyDiaDiagramData_CallbackObject(DiagramData *dia,Layer *layer,DiaObject *obj,voi
     arg = Py_BuildValue ("(OOO)", pydata,pylayer,pyobj);
     if (arg) {
       res = PyEval_CallObject (func, arg);
-      /*ON_RES(res, TRUE);*/
+      ON_RES(res, FALSE);
     }
     
     /* Cleanup */
diff --git a/plug-ins/python/pydia-render.c b/plug-ins/python/pydia-render.c
index 7001d7d..ede92a8 100644
--- a/plug-ins/python/pydia-render.c
+++ b/plug-ins/python/pydia-render.c
@@ -1023,7 +1023,6 @@ draw_string(DiaRenderer *renderer,
            Color *colour)
 {
   PyObject *func, *res, *arg, *self = PYDIA_RENDERER (renderer);
-  int len;
 
   switch (alignment) {
   case ALIGN_LEFT:
@@ -1033,8 +1032,6 @@ draw_string(DiaRenderer *renderer,
   case ALIGN_RIGHT:
     break;
   }
-  /* work out size of first chunk of text */
-  len = strlen(text);
 
   func = PyObject_GetAttrString (self, "draw_string");
   if (func && PyCallable_Check(func)) {
diff --git a/plug-ins/vdx/vdx-xml.c b/plug-ins/vdx/vdx-xml.c
index 6eff6a2..70afb26 100644
--- a/plug-ins/vdx/vdx-xml.c
+++ b/plug-ins/vdx/vdx-xml.c
@@ -5193,3 +5193,4 @@ vdx_write_object(FILE *file, unsigned int depth, const void *p)
     if (Any->type != vdx_types_text)
         fprintf(file, "%s</%s>\n", pad, vdx_Types[(int)Any->type]);
 }
+
diff --git a/plug-ins/xfig/xfig-import.c b/plug-ins/xfig/xfig-import.c
index 7d4d6f9..5d848dd 100644
--- a/plug-ins/xfig/xfig-import.c
+++ b/plug-ins/xfig/xfig-import.c
@@ -843,7 +843,6 @@ fig_read_arc(FILE *file, DiaContext *ctx)
     int x1, y1;
     int x2, y2;
     int x3, y3;
-    real radius;
     char* old_locale;
     Point p2, pm;
     real distance;
@@ -879,7 +878,6 @@ fig_read_arc(FILE *file, DiaContext *ctx)
        backward_arrow_info = fig_read_arrow(file, ctx);
     }
 
-    radius = sqrt((x1-center_x)*(x1-center_x)+(y1-center_y)*(y1-center_y))/FIG_UNIT;
     p2.x = x2/FIG_UNIT; p2.y = y2/FIG_UNIT;
     pm.x = (x1+x3)/(2*FIG_UNIT); pm.y = (y1+y3)/(2*FIG_UNIT);
     distance = distance_point_point (&p2, &pm);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]