GNOME.org
 

[vte/vte-0-36] build: Fix many compiler warnings

commit be8407dbc4c669cd5c00c9ab95ade40e3b94e46d
Author: Egmont Koblinger <egmont gmail com>
Date:   Mon Mar 3 13:41:38 2014 +0100

    build: Fix many compiler warnings

 src/pty.c       |    6 ------
 src/slowcat.c   |    2 +-
 src/vte.c       |   51 +++++++++------------------------------------------
 src/vteaccess.c |    5 -----
 src/vteapp.c    |    5 -----
 src/vteconv.c   |    3 ---
 src/vteseq.c    |    8 ++------
 7 files changed, 12 insertions(+), 68 deletions(-)
---
diff --git a/src/pty.c b/src/pty.c
index 3d0022c..2233b7c 100644
--- a/src/pty.c
+++ b/src/pty.c
@@ -675,15 +675,12 @@ vte_pty_set_size(VtePty *pty,
                  int columns,
                  GError **error)
 {
-        VtePtyPrivate *priv;
        struct winsize size;
         int master;
        int ret;
 
         g_return_val_if_fail(VTE_IS_PTY(pty), FALSE);
 
-        priv = pty->priv;
-
         master = vte_pty_get_fd(pty);
 
        memset(&size, 0, sizeof(size));
@@ -734,15 +731,12 @@ vte_pty_get_size(VtePty *pty,
                  int *columns,
                  GError **error)
 {
-        VtePtyPrivate *priv;
        struct winsize size;
         int master;
        int ret;
 
         g_return_val_if_fail(VTE_IS_PTY(pty), FALSE);
 
-        priv = pty->priv;
-
         master = vte_pty_get_fd(pty);
 
        memset(&size, 0, sizeof(size));
diff --git a/src/slowcat.c b/src/slowcat.c
index 344fd15..15983d2 100644
--- a/src/slowcat.c
+++ b/src/slowcat.c
@@ -62,7 +62,7 @@ catfile(const char *pathname, long delay, long chunksize)
                        }
                }
                if (i > 0) {
-                       int bytes;
+                       int bytes G_GNUC_UNUSED;
                        bytes = write(STDOUT_FILENO, buf, i);
                        fsync(STDOUT_FILENO);
                }
diff --git a/src/vte.c b/src/vte.c
index f55285c..55c5b82 100644
--- a/src/vte.c
+++ b/src/vte.c
@@ -3627,13 +3627,10 @@ vte_terminal_pty_new(VteTerminal *terminal,
                      VtePtyFlags flags,
                      GError **error)
 {
-        VteTerminalPrivate *pvt;
         VtePty *pty;
 
         g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL);
 
-        pvt = terminal->pvt;
-
         pty = vte_pty_new(flags, error);
         if (pty == NULL)
                 return NULL;
@@ -6366,7 +6363,6 @@ vte_terminal_get_text_range_maybe_wrapped(VteTerminal *terminal,
                                          gboolean include_trailing_spaces)
 {
        glong col, row, last_empty, last_emptycol, last_nonempty, last_nonemptycol;
-       VteScreen *screen;
        const VteCell *pcell = NULL;
        GString *string;
        struct _VteCharAttributes attr;
@@ -6375,8 +6371,6 @@ vte_terminal_get_text_range_maybe_wrapped(VteTerminal *terminal,
        if (!is_selected)
                is_selected = always_selected;
 
-       screen = terminal->pvt->screen;
-
        if (attributes)
                g_array_set_size (attributes, 0);
 
@@ -8400,14 +8394,12 @@ vte_terminal_set_scroll_adjustments(GtkWidget *widget,
 void
 vte_terminal_set_emulation(VteTerminal *terminal, const char *emulation)
 {
-        VteTerminalPrivate *pvt;
         GObject *object;
        int columns, rows;
 
        g_return_if_fail(VTE_IS_TERMINAL(terminal));
 
         object = G_OBJECT(terminal);
-        pvt = terminal->pvt;
 
         g_object_freeze_notify(object);
 
@@ -9267,8 +9259,7 @@ vte_terminal_realize(GtkWidget *widget)
        VteTerminal *terminal;
        GdkWindowAttr attributes;
        GtkAllocation allocation;
-        GdkColor color;
-       guint attributes_mask = 0, i;
+       guint attributes_mask = 0;
 
        _vte_debug_print(VTE_DEBUG_LIFECYCLE, "vte_terminal_realize()\n");
 
@@ -9562,7 +9553,7 @@ vte_terminal_draw_graphic(VteTerminal *terminal, vteunistr c,
                          gint x, gint y,
                          gint column_width, gint columns, gint row_height)
 {
-       gint width, xcenter, xright, ycenter, ybottom, i;
+       gint width, xcenter, xright, ycenter, ybottom;
         int upper_half, lower_half, left_half, right_half;
         int light_line_width, heavy_line_width;
         double adjust;
@@ -10327,7 +10318,7 @@ vte_terminal_draw_cells(VteTerminal *terminal,
                        gboolean strikethrough, gboolean hilite, gboolean boxed,
                        gint column_width, gint row_height)
 {
-       int i, x, y, ascent;
+       int i, x, y;
        gint columns = 0;
        PangoColor fg, bg;
 
@@ -10349,7 +10340,6 @@ vte_terminal_draw_cells(VteTerminal *terminal,
        bold = bold && terminal->pvt->allow_bold;
        vte_terminal_get_rgb_from_index(terminal, fore, &fg);
        vte_terminal_get_rgb_from_index(terminal, back, &bg);
-       ascent = terminal->char_ascent;
 
        i = 0;
        do {
@@ -10672,7 +10662,6 @@ vte_terminal_draw_rows(VteTerminal *terminal,
        struct _vte_draw_text_request items[4*VTE_DRAW_MAX_LENGTH];
        gint i, j, row, rows, x, y, end_column;
        guint fore, nfore, back, nback;
-       glong delta;
        gboolean underline, nunderline, bold, nbold, italic, nitalic, hilite, nhilite,
                 selected, nselected, strikethrough, nstrikethrough;
        guint item_count;
@@ -10684,7 +10673,6 @@ vte_terminal_draw_rows(VteTerminal *terminal,
        end_column = start_column + column_count;
 
        /* clear the background */
-       delta = screen->scroll_delta;
        x = start_x + terminal->pvt->inner_border.left;
        y = start_y + terminal->pvt->inner_border.top;
        row = start_row;
@@ -10994,13 +10982,10 @@ fg_out:
 static void
 vte_terminal_expand_region (VteTerminal *terminal, GdkRegion *region, const GdkRectangle *area)
 {
-       VteScreen *screen;
        int width, height;
        int row, col, row_stop, col_stop;
        VteRegionRectangle rect;
 
-       screen = terminal->pvt->screen;
-
        width = terminal->char_width;
        height = terminal->char_height;
 
@@ -11240,8 +11225,8 @@ static void
 vte_terminal_paint_im_preedit_string(VteTerminal *terminal)
 {
        VteScreen *screen;
-       int row, drow, col, columns;
-       long width, height, ascent, descent, delta;
+       int row, col, columns;
+       long width, height, delta;
        int i, len;
        guint fore, back;
 
@@ -11254,11 +11239,8 @@ vte_terminal_paint_im_preedit_string(VteTerminal *terminal)
        /* Keep local copies of rendering information. */
        width = terminal->char_width;
        height = terminal->char_height;
-       ascent = terminal->char_ascent;
-       descent = terminal->char_descent;
        delta = screen->scroll_delta;
 
-       drow = screen->cursor_current.row;
        row = screen->cursor_current.row - delta;
 
        /* Find out how many columns the pre-edit string takes up. */
@@ -11632,30 +11614,17 @@ vte_terminal_scroll(GtkWidget *widget, GdkEventScroll *event)
 static AtkObject *
 vte_terminal_get_accessible(GtkWidget *widget)
 {
-       VteTerminal *terminal;
        static gboolean first_time = TRUE;
        static GQuark quark_accessible_object;
-
-       terminal = VTE_TERMINAL(widget);
+       AtkRegistry *default_registry;
+       AtkObjectFactory *factory;
+       AtkObject *accessible;
 
        if (first_time) {
-               AtkObjectFactory *factory;
                AtkRegistry *registry;
-               GType derived_type;
-               GType derived_atk_type;
-
-               /*
-                * Figure out whether accessibility is enabled by looking at the
-                * type of the accessible object which would be created for
-                * the parent type of VteTerminal.
-                */
-               derived_type = g_type_parent (VTE_TYPE_TERMINAL);
 
                registry = atk_get_default_registry ();
-               factory = atk_registry_get_factory (registry, derived_type);
 
-               derived_atk_type = atk_object_factory_get_accessible_type (
-                       factory);
                atk_registry_set_factory_type (registry, VTE_TYPE_TERMINAL,
                        vte_terminal_accessible_factory_get_type ());
                quark_accessible_object = g_quark_from_static_string (
@@ -11663,9 +11632,7 @@ vte_terminal_get_accessible(GtkWidget *widget)
                first_time = FALSE;
        }
 
-       AtkRegistry *default_registry = atk_get_default_registry ();
-       AtkObjectFactory *factory;
-       AtkObject *accessible;
+       default_registry = atk_get_default_registry ();
        accessible = g_object_get_qdata (G_OBJECT (widget),
                quark_accessible_object);
        if (accessible)
diff --git a/src/vteaccess.c b/src/vteaccess.c
index 5113a6e..16a3508 100644
--- a/src/vteaccess.c
+++ b/src/vteaccess.c
@@ -787,8 +787,6 @@ focus_cb (GtkWidget     *widget,
                GdkEventFocus *event)
 {
        AtkObject* accessible;
-       gboolean return_val;
-       return_val = FALSE;
 
        accessible = gtk_widget_get_accessible (widget);
 
@@ -1392,7 +1390,6 @@ static gunichar
 vte_terminal_accessible_get_character_at_offset(AtkText *text, gint offset)
 {
        VteTerminalAccessiblePrivate *priv;
-       int mapped;
        char *unichar;
        gunichar ret;
 
@@ -1404,8 +1401,6 @@ vte_terminal_accessible_get_character_at_offset(AtkText *text, gint offset)
 
        g_assert(offset < (int) priv->snapshot_characters->len);
 
-       mapped = g_array_index(priv->snapshot_characters, int, offset);
-
        unichar = vte_terminal_accessible_get_text(text, offset, offset + 1);
        ret = g_utf8_get_char(unichar);
        g_free(unichar);
diff --git a/src/vteapp.c b/src/vteapp.c
index 06f8440..93d9912 100644
--- a/src/vteapp.c
+++ b/src/vteapp.c
@@ -54,12 +54,9 @@ window_title_changed(GtkWidget *widget, gpointer win)
 static void
 icon_title_changed(GtkWidget *widget, gpointer win)
 {
-       GtkWindow *window;
-
        g_assert(VTE_TERMINAL(widget));
        g_assert(GTK_IS_WINDOW(win));
        g_assert(VTE_TERMINAL(widget)->icon_title != NULL);
-       window = GTK_WINDOW(win);
 
        g_message("Icon title changed to \"%s\".\n",
                  VTE_TERMINAL(widget)->icon_title);
@@ -68,7 +65,6 @@ icon_title_changed(GtkWidget *widget, gpointer win)
 static void
 char_size_changed(GtkWidget *widget, guint width, guint height, gpointer data)
 {
-       VteTerminal *terminal;
        GtkWindow *window;
        GdkGeometry geometry;
        GtkBorder *inner_border;
@@ -76,7 +72,6 @@ char_size_changed(GtkWidget *widget, guint width, guint height, gpointer data)
        g_assert(GTK_IS_WINDOW(data));
        g_assert(VTE_IS_TERMINAL(widget));
 
-       terminal = VTE_TERMINAL(widget);
        window = GTK_WINDOW(data);
        if (!gtk_widget_get_realized (GTK_WIDGET (window)))
                return;
diff --git a/src/vteconv.c b/src/vteconv.c
index 8fe72a8..265d6f7 100644
--- a/src/vteconv.c
+++ b/src/vteconv.c
@@ -208,7 +208,6 @@ _vte_conv(VteConv converter,
        const guchar *work_inbuf_start, *work_inbuf_working;
        guchar *work_outbuf_start, *work_outbuf_working;
        gsize work_inbytes, work_outbytes;
-       gsize in_converted, out_converted;
 
        g_assert(converter != NULL);
        g_assert(converter != VTE_INVALID_CONV);
@@ -217,8 +216,6 @@ _vte_conv(VteConv converter,
        work_outbuf_start = work_outbuf_working = *outbuf;
        work_inbytes = *inbytes_left;
        work_outbytes = *outbytes_left;
-       in_converted = 0;
-       out_converted = 0;
 
        /* Possibly convert the input data from gunichars to UTF-8. */
        if (converter->in_unichar) {
diff --git a/src/vteseq.c b/src/vteseq.c
index 2383a08..62a4fa7 100644
--- a/src/vteseq.c
+++ b/src/vteseq.c
@@ -802,7 +802,7 @@ vte_sequence_handler_decset_internal(VteTerminal *terminal,
         do {
                 gboolean *bvalue = NULL;
                 gint *ivalue = NULL;
-                gpointer *pvalue = NULL, pfvalue, ptvalue;
+                gpointer *pvalue = NULL, pfvalue = NULL, ptvalue = NULL;
                 gpointer p;
 
                /* Handle settings we want to ignore. */
@@ -2308,16 +2308,14 @@ static void
 vte_sequence_handler_up (VteTerminal *terminal, GValueArray *params)
 {
        VteScreen *screen;
-       long start, end;
+       long start;
 
        screen = terminal->pvt->screen;
 
        if (screen->scrolling_restricted) {
                start = screen->insert_delta + screen->scrolling_region.start;
-               end = screen->insert_delta + screen->scrolling_region.end;
        } else {
                start = screen->insert_delta;
-               end = start + terminal->row_count - 1;
        }
 
        screen->cursor_current.row = MAX(screen->cursor_current.row - 1, start);
@@ -3319,7 +3317,6 @@ static void
 vte_sequence_handler_window_manipulation (VteTerminal *terminal, GValueArray *params)
 {
        GdkScreen *gscreen;
-       VteScreen *screen;
        GValue *value;
        GtkWidget *widget;
        char buf[128];
@@ -3329,7 +3326,6 @@ vte_sequence_handler_window_manipulation (VteTerminal *terminal, GValueArray *pa
        GtkAllocation allocation;
 
        widget = &terminal->widget;
-       screen = terminal->pvt->screen;
 
        for (i = 0; ((params != NULL) && (i < params->n_values)); i++) {
                arg1 = arg2 = -1;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]