From 11fb09e38ffcbadc2629361377413f3ce12ec4da Mon Sep 17 00:00:00 2001
From: Dave Barach <dave@barachs.net>
Date: Thu, 6 Aug 2020 12:10:09 -0400
Subject: misc: harmonize names

Type: fix

Signed-off-by: Dave Barach <dave@barachs.net>
Change-Id: Ibad744788e200ce012ad88ff59c2c34920742454
---
 src/tools/g2/pointsel.c | 14 +++++++-------
 src/tools/g2/view1.c    |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/tools/g2')

diff --git a/src/tools/g2/pointsel.c b/src/tools/g2/pointsel.c
index 1d0a217297e..59822377219 100644
--- a/src/tools/g2/pointsel.c
+++ b/src/tools/g2/pointsel.c
@@ -783,8 +783,8 @@ boolean read_event_definitions (char *filename)
     return(TRUE);
 }
 
-static event_def_t dummy_event;
-static char dummy_string[32];
+static event_def_t placeholder_event;
+static char placeholder_string[32];
 
 /****************************************************************************
 * find_event_definition
@@ -797,7 +797,7 @@ event_def_t *find_event_definition (ulong code)
     event_def_t *edp;
 
     if (g_neventdefs == 0)
-        goto use_dummy;
+        goto use_placeholder;
 
     bottom = g_neventdefs-1;
     top = 0;
@@ -811,13 +811,13 @@ event_def_t *find_event_definition (ulong code)
             return(edp);
 
         if (top >= bottom) {
-        use_dummy:
-            edp = &dummy_event;
+        use_placeholder:
+            edp = &placeholder_event;
             edp->selected = TRUE;
             edp->event = code;
             edp->format = "0x%x";
-            snprintf (dummy_string, sizeof(dummy_string), "E%lu", code);
-            edp->name = &dummy_string[0];
+            snprintf (placeholder_string, sizeof(placeholder_string), "E%lu", code);
+            edp->name = &placeholder_string[0];
             return(edp);
         }
 
diff --git a/src/tools/g2/view1.c b/src/tools/g2/view1.c
index 38c41522a45..3902c0a2dc1 100644
--- a/src/tools/g2/view1.c
+++ b/src/tools/g2/view1.c
@@ -819,7 +819,7 @@ static int toggle_event_select(GdkEventButton *event, v1_geometry_t *vp)
     int x, y;
     GdkRectangle *rp;
     GdkRectangle hit_rect;
-    GdkRectangle dummy;
+    GdkRectangle placeholder;
     event_t *ep;
     event_def_t *edp;
     char tmpbuf [1024];
@@ -888,7 +888,7 @@ static int toggle_event_select(GdkEventButton *event, v1_geometry_t *vp)
             /* Figure out the dimensions of the detail box */
             format_popbox_string(tmpbuf, sizeof(tmpbuf), ep, edp);
             rp = tbox(tmpbuf, x, y - vp->pop_offset, TBOX_GETRECT_BOXED);
-            if (gdk_rectangle_intersect(rp, &hit_rect, &dummy)) {
+            if (gdk_rectangle_intersect(rp, &hit_rect, &placeholder)) {
                 ep->flags &= ~EVENT_FLAG_SELECT;
                 view1_display_when_idle();
                 return 0;
@@ -900,7 +900,7 @@ static int toggle_event_select(GdkEventButton *event, v1_geometry_t *vp)
         /* Figure out the dimensions of the regular box */
         rp = tbox(tmpbuf, x, y, TBOX_GETRECT_EVENT);
 
-        if (gdk_rectangle_intersect(rp, &hit_rect, &dummy)) {
+        if (gdk_rectangle_intersect(rp, &hit_rect, &placeholder)) {
             /* we hit the rectangle. */
             if (ep->flags & EVENT_FLAG_SELECT) {
                 ep->flags &= ~EVENT_FLAG_SELECT;
-- 
cgit 1.2.3-korg