GNOME.org
 

[gnumeric] Compilation: avoid overriding reserved identifier link.

commit ce0f37599274f7ae51c1d05af2a731333d7ce1b9
Author: Morten Welinder <terra gnome org>
Date:   Wed Mar 8 10:25:11 2017 -0500

    Compilation: avoid overriding reserved identifier link.

 plugins/fn-info/functions.c |    8 ++++----
 plugins/html/html_read.c    |   10 +++++-----
 src/commands.c              |   16 ++++++++--------
 src/gui-util.c              |    4 ++--
 src/gui-util.h              |    2 +-
 src/hlink-impl.h            |    8 ++++----
 src/item-grid.c             |   16 ++++++++--------
 src/sheet-style.c           |    6 +++---
 src/xml-sax-read.c          |    8 ++++----
 src/xml-sax-write.c         |   12 ++++++------
 10 files changed, 45 insertions(+), 45 deletions(-)
---
diff --git a/plugins/fn-info/functions.c b/plugins/fn-info/functions.c
index 80c0990..a34a242 100644
--- a/plugins/fn-info/functions.c
+++ b/plugins/fn-info/functions.c
@@ -1830,7 +1830,7 @@ gnumeric_get_link (GnmFuncEvalInfo *ei, GnmValue const * const *argv)
                GnmCellRef const * a = &v->v_range.cell.a;
                GnmCellRef const * b = &v->v_range.cell.b;
                Sheet *sheet;
-               GnmHLink *link;
+               GnmHLink *lnk;
                GnmCellPos pos;
 
                if (a->col != b->col || a->row != b->row || a->sheet !=b->sheet)
@@ -1838,10 +1838,10 @@ gnumeric_get_link (GnmFuncEvalInfo *ei, GnmValue const * const *argv)
 
                sheet = (a->sheet == NULL) ? ei->pos->sheet : a->sheet;
                gnm_cellpos_init_cellref (&pos, a, &(ei->pos->eval), sheet);
-               link = gnm_sheet_hlink_find (sheet, &pos);
+               lnk = gnm_sheet_hlink_find (sheet, &pos);
 
-               if (link)
-                       return value_new_string (gnm_hlink_get_target (link));
+               if (lnk)
+                       return value_new_string (gnm_hlink_get_target (lnk));
        }
 
        return value_new_empty ();
diff --git a/plugins/html/html_read.c b/plugins/html/html_read.c
index b428dca..5dd6693 100644
--- a/plugins/html/html_read.c
+++ b/plugins/html/html_read.c
@@ -186,7 +186,7 @@ html_read_row (htmlNodePtr cur, htmlDocPtr doc, GnmHtmlTableCtxt *tc)
                        GnmCellPos pos;
                        GnmStyle *mstyle;
                        GSList *hrefs = NULL;
-                       GnmHLink *link = NULL;
+                       GnmHLink *lnk = NULL;
 
                        /* Check whether we need to skip merges from above */
                        pos.row = tc->row;
@@ -236,15 +236,15 @@ html_read_row (htmlNodePtr cur, htmlDocPtr doc, GnmHtmlTableCtxt *tc)
                                        CXML2C (h_buf->content), h_buf->use);
                                if (strncmp (url, "mailto:";,
                                             strlen ("mailto:";)) == 0)
-                                       link = g_object_new (
+                                       lnk = g_object_new (
                                                gnm_hlink_email_get_type (),
                                                NULL);
                                else
-                                       link = g_object_new (
+                                       lnk = g_object_new (
                                                gnm_hlink_url_get_type (),
                                                NULL);
-                               gnm_hlink_set_target (link, url);
-                               gnm_style_set_hlink (mstyle, link);
+                               gnm_hlink_set_target (lnk, url);
+                               gnm_style_set_hlink (mstyle, lnk);
                                gnm_style_set_font_uline (mstyle,
                                                          UNDERLINE_SINGLE);
                                gnm_style_set_font_color (mstyle,
diff --git a/src/commands.c b/src/commands.c
index 742f85a..ad2605e 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -7478,7 +7478,7 @@ cmd_so_set_button_finalize (GObject *cmd)
 
 gboolean
 cmd_so_set_button (WorkbookControl *wbc,
-                  SheetObject *so, GnmExprTop const *link,
+                  SheetObject *so, GnmExprTop const *lnk,
                   char *old_label, char *new_label)
 {
        CmdSOSetButton *me;
@@ -7490,7 +7490,7 @@ cmd_so_set_button (WorkbookControl *wbc,
        me->cmd.size = 1;
        me->cmd.cmd_descriptor = g_strdup (_("Configure Button"));
        me->so = so;
-       me->new_link = link;
+       me->new_link = lnk;
        me->old_label = old_label;
        me->new_label = new_label;
 
@@ -7558,7 +7558,7 @@ cmd_so_set_radio_button_finalize (GObject *cmd)
 
 gboolean
 cmd_so_set_radio_button (WorkbookControl *wbc,
-                        SheetObject *so, GnmExprTop const *link,
+                        SheetObject *so, GnmExprTop const *lnk,
                         char *old_label, char *new_label,
                         GnmValue *old_value, GnmValue *new_value)
 {
@@ -7571,7 +7571,7 @@ cmd_so_set_radio_button (WorkbookControl *wbc,
        me->cmd.size = 1;
        me->cmd.cmd_descriptor = g_strdup (_("Configure Radio Button"));
        me->so = so;
-       me->new_link = link;
+       me->new_link = lnk;
        me->old_label = old_label;
        me->new_label = new_label;
        me->old_value = old_value;
@@ -7635,7 +7635,7 @@ cmd_so_set_checkbox_finalize (GObject *cmd)
 
 gboolean
 cmd_so_set_checkbox (WorkbookControl *wbc,
-                    SheetObject *so, GnmExprTop const *link,
+                    SheetObject *so, GnmExprTop const *lnk,
                     char *old_label, char *new_label)
 {
        CmdSOSetCheckbox *me;
@@ -7647,7 +7647,7 @@ cmd_so_set_checkbox (WorkbookControl *wbc,
        me->cmd.size = 1;
        me->cmd.cmd_descriptor = g_strdup (_("Configure Checkbox"));
        me->so = so;
-       me->new_link = link;
+       me->new_link = lnk;
        me->old_label = old_label;
        me->new_label = new_label;
 
@@ -7738,7 +7738,7 @@ cmd_so_set_adjustment_finalize (GObject *cmd)
 
 gboolean
 cmd_so_set_adjustment (WorkbookControl *wbc,
-                      SheetObject *so, GnmExprTop const *link,
+                      SheetObject *so, GnmExprTop const *lnk,
                       gboolean horizontal,
                       int lower, int upper,
                       int step, int page,
@@ -7754,7 +7754,7 @@ cmd_so_set_adjustment (WorkbookControl *wbc,
        me->cmd.cmd_descriptor = g_strdup ((undo_label == NULL) ?
                                           _("Configure Adjustment") : _(undo_label));
        me->so = so;
-       me->new_link = link;
+       me->new_link = lnk;
        me->old_lower = lower;
        me->old_upper = upper;
        me->old_step = step;
diff --git a/src/gui-util.c b/src/gui-util.c
index 6821b6c..7ced0af 100644
--- a/src/gui-util.c
+++ b/src/gui-util.c
@@ -701,9 +701,9 @@ gnm_create_popup_menu (GnmPopupMenuElement const *elements,
 }
 
 void
-gnm_init_help_button (GtkWidget *w, char const *link)
+gnm_init_help_button (GtkWidget *w, char const *lnk)
 {
-       go_gtk_help_button_init (w, gnm_sys_data_dir (), "gnumeric", link);
+       go_gtk_help_button_init (w, gnm_sys_data_dir (), "gnumeric", lnk);
 }
 
 char *
diff --git a/src/gui-util.h b/src/gui-util.h
index 9d333e4..590e459 100644
--- a/src/gui-util.h
+++ b/src/gui-util.h
@@ -69,7 +69,7 @@ void gnm_create_popup_menu (GnmPopupMenuElement const *elements,
 
 #define gnm_filter_modifiers(a) ((a) & (GDK_MODIFIER_MASK & (~(GDK_LOCK_MASK|GDK_MOD2_MASK|GDK_MOD5_MASK))))
 
-void gnm_init_help_button      (GtkWidget *w, char const *link);
+void gnm_init_help_button      (GtkWidget *w, char const *lnk);
 
 char *gnm_textbuffer_get_text (GtkTextBuffer *buf);
 char *gnm_textview_get_text (GtkTextView *text_view);
diff --git a/src/hlink-impl.h b/src/hlink-impl.h
index c4476c4..da895c5 100644
--- a/src/hlink-impl.h
+++ b/src/hlink-impl.h
@@ -15,10 +15,10 @@ struct _GnmHLink {
 typedef struct {
        GObjectClass obj;
 
-       gboolean (*Activate) (GnmHLink *link, WBCGtk *wbcg);
-       void (*set_sheet) (GnmHLink *link, Sheet *sheet);
-       void (*set_target) (GnmHLink *link, const char *target);
-       const char * (*get_target) (GnmHLink const *link);
+       gboolean (*Activate) (GnmHLink *lnk, WBCGtk *wbcg);
+       void (*set_sheet) (GnmHLink *lnk, Sheet *sheet);
+       void (*set_target) (GnmHLink *lnk, const char *target);
+       const char * (*get_target) (GnmHLink const *lnk);
 } GnmHLinkClass;
 
 G_END_DECLS
diff --git a/src/item-grid.c b/src/item-grid.c
index d9956af..93d2186 100644
--- a/src/item-grid.c
+++ b/src/item-grid.c
@@ -1060,7 +1060,7 @@ cb_cursor_come_to_rest (GnmItemGrid *ig)
        Sheet const *sheet = scg_sheet (ig->scg);
        GocCanvas *canvas = ig->canvas_item.canvas;
        GnmPane *pane = GNM_PANE (canvas);
-       GnmHLink *link;
+       GnmHLink *lnk;
        gint64 x, y;
        GnmCellPos pos;
        char const *tiptext;
@@ -1072,9 +1072,9 @@ cb_cursor_come_to_rest (GnmItemGrid *ig)
        pos.col = gnm_pane_find_col (pane, x, NULL);
        pos.row = gnm_pane_find_row (pane, y, NULL);
 
-       link = gnm_sheet_hlink_find (sheet, &pos);
-       if (link != NULL && (tiptext = gnm_hlink_get_tip (link)) != NULL) {
-               g_return_val_if_fail (link == ig->cur_link, FALSE);
+       lnk = gnm_sheet_hlink_find (sheet, &pos);
+       if (lnk != NULL && (tiptext = gnm_hlink_get_tip (lnk)) != NULL) {
+               g_return_val_if_fail (lnk == ig->cur_link, FALSE);
 
                if (ig->tip == NULL && strlen (tiptext) > 0) {
                        GtkWidget *cw = GTK_WIDGET (canvas);
@@ -1178,11 +1178,11 @@ item_grid_button_released (GocItem *item, int button, G_GNUC_UNUSED double x_, G
        if (selecting == GNM_ITEM_GRID_SELECTING_CELL_RANGE && button == 1) {
                GnmCellPos const *pos = sv_is_singleton_selected (scg_view (scg));
                if (pos != NULL) {
-                       GnmHLink *link;
+                       GnmHLink *lnk;
                        /* check for hyper links */
-                       link = gnm_sheet_hlink_find (sheet, pos);
-                       if (link != NULL)
-                               gnm_hlink_activate (link, scg_wbcg (scg));
+                       lnk = gnm_sheet_hlink_find (sheet, pos);
+                       if (lnk != NULL)
+                               gnm_hlink_activate (lnk, scg_wbcg (scg));
                }
        }
        return TRUE;
diff --git a/src/sheet-style.c b/src/sheet-style.c
index 5201520..d228789 100644
--- a/src/sheet-style.c
+++ b/src/sheet-style.c
@@ -3118,9 +3118,9 @@ cb_find_link (GnmStyle *style,
              G_GNUC_UNUSED int width, G_GNUC_UNUSED int height,
              G_GNUC_UNUSED GnmRange const *apply_to, gpointer user)
 {
-       GnmHLink **link = user;
-       if (*link == NULL)
-               *link = gnm_style_get_hlink (style);
+       GnmHLink **plink = user;
+       if (*plink == NULL)
+               *plink = gnm_style_get_hlink (style);
 }
 
 /**
diff --git a/src/xml-sax-read.c b/src/xml-sax-read.c
index 11547c6..aa423da 100644
--- a/src/xml-sax-read.c
+++ b/src/xml-sax-read.c
@@ -1860,10 +1860,10 @@ xml_sax_hlink (GsfXMLIn *xin, xmlChar const **attrs)
 
        if (NULL != type && NULL != target) {
                GType typ = g_type_from_name (type);
-               GnmHLink *link = gnm_hlink_new (typ, state->sheet);
-               gnm_hlink_set_target (link, target);
-               gnm_hlink_set_tip (link, tip);
-               gnm_style_set_hlink (state->style, link);
+               GnmHLink *lnk = gnm_hlink_new (typ, state->sheet);
+               gnm_hlink_set_target (lnk, target);
+               gnm_hlink_set_tip (lnk, tip);
+               gnm_style_set_hlink (state->style, lnk);
        }
 
        g_free (type);
diff --git a/src/xml-sax-write.c b/src/xml-sax-write.c
index 975ab2f..0a92ff1 100644
--- a/src/xml-sax-write.c
+++ b/src/xml-sax-write.c
@@ -476,7 +476,7 @@ xml_write_style (GnmOutputXML *state, GnmStyle const *style)
                GNM "Diagonal"
        };
        GnmValidation const *v;
-       GnmHLink   const *link;
+       GnmHLink   const *lnk;
        GnmInputMsg const *im;
        GnmStyleConditions const *sc;
        GnmStyleBorderType t;
@@ -558,12 +558,12 @@ xml_write_style (GnmOutputXML *state, GnmStyle const *style)
        }
 
        if (gnm_style_is_element_set (style, MSTYLE_HLINK) &&
-           NULL != (link = gnm_style_get_hlink (style))) {
+           NULL != (lnk = gnm_style_get_hlink (style))) {
                gsf_xml_out_start_element (state->output, GNM "HyperLink");
-               gsf_xml_out_add_cstr (state->output, "type", g_type_name (G_OBJECT_TYPE (link)));
-               gsf_xml_out_add_cstr (state->output, "target", gnm_hlink_get_target (link));
-               if (gnm_hlink_get_tip (link) != NULL)
-                       gsf_xml_out_add_cstr (state->output, "tip", gnm_hlink_get_tip (link));
+               gsf_xml_out_add_cstr (state->output, "type", g_type_name (G_OBJECT_TYPE (lnk)));
+               gsf_xml_out_add_cstr (state->output, "target", gnm_hlink_get_target (lnk));
+               if (gnm_hlink_get_tip (lnk) != NULL)
+                       gsf_xml_out_add_cstr (state->output, "tip", gnm_hlink_get_tip (lnk));
                gsf_xml_out_end_element (state->output);
        }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]