Remove global variables JunkRoot, JunkChild

Replace with a local variable following the naming scheme from
Identify() in src/menus.c.

Signed-off-by: Tim Wiederhake <twied@gmx.net>

1 files changed, 2 insertions, 3 deletions

diff --git a/src/twm.c b/src/twm.c
index 0b42bd2..881a29a 100644
--- a/src/twm.c
+++ b/src/twm.c
@@ -138,8 +138,6 @@ int ParseError;                 /* error parsing the .twmrc file */
 
 int HandlingEvents = FALSE;     /* are we handling events yet? */
 
-Window JunkRoot;                /* junk window */
-Window JunkChild;               /* junk window */
 int JunkX;                      /* junk variable */
 int JunkY;                      /* junk variable */
 unsigned int JunkWidth, JunkHeight, JunkBW, JunkDepth, JunkMask;
@@ -823,8 +821,9 @@ RestoreWithdrawnLocation(TwmWindow *tmp)
     int gravx, gravy;
     unsigned int bw;
     XWindowChanges xwc;
+    Window wdummy = None;
 
-    if (XGetGeometry(dpy, tmp->w, &JunkRoot, &xwc.x, &xwc.y,
+    if (XGetGeometry(dpy, tmp->w, &wdummy, &xwc.x, &xwc.y,
                      &JunkWidth, &JunkHeight, &bw, &JunkDepth)) {
         unsigned mask;