Get rid of several unused variables

* cmd_definekey: actually use cmd
* cmd_meta: remove ev1
* cmd_resize: remove nbytes
* cmd_ratrelwarp: remove s
* draw_string: remove lgv, lgc, mask; lgc wasn't XFreeGC'ed
* get_more_input: remove nbytes
* cleanup_frame: remove last_win
* get_window_list: remove other_window

Patch from Bernhard R. Link

5 files changed, 15 insertions, 30 deletions

diff --git a/src/actions.c b/src/actions.c
index c6cb373..e31df72 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -1119,9 +1119,9 @@ cmd_definekey (int interactive UNUSED, struct cmdarg **args)
     ungrab_keys_all_wins ();
 
   if ((key_action = find_keybinding (key->sym, key->state, map)))
-    replace_keybinding (key_action, ARG_STRING(2));
+    replace_keybinding (key_action, cmd);
   else
-    add_keybinding (key->sym, key->state, ARG_STRING(2), map);
+    add_keybinding (key->sym, key->state, cmd, map);
 
   /* Update the grabbed keys. */
   if (map == find_keymap (defaults.top_kmap))
@@ -1162,31 +1162,30 @@ cmd_meta (int interactive UNUSED, struct cmdarg **args)
 {
   cmdret *ret = NULL;
   struct rp_key key;
-  XEvent ev1, ev;
-  ev = rp_current_event;
+  XEvent ev;
 
   if (current_window() == NULL)
     return cmdret_new (RET_FAILURE, NULL);
 
-      ev1.xkey.type = KeyPress;
-      ev1.xkey.display = dpy;
-      ev1.xkey.window = current_window()->w;
+      ev.xkey.type = KeyPress;
+      ev.xkey.display = dpy;
+      ev.xkey.window = current_window()->w;
 
   if (args[0])
     {
       if((ret = parse_keydesc (ARG_STRING(0), &key)))
         return ret;
 
-      ev1.xkey.state = rp_mask_to_x11_mask (key.state);
-      if(!(ev1.xkey.keycode = XKeysymToKeycode (dpy, key.sym)))
+      ev.xkey.state = rp_mask_to_x11_mask (key.state);
+      if(!(ev.xkey.keycode = XKeysymToKeycode (dpy, key.sym)))
         return cmdret_new (RET_FAILURE, "meta: Couldn't convert keysym to keycode");
     }
   else
     {
-      ev1.xkey.state = rp_mask_to_x11_mask (prefix_key.state);
-      ev1.xkey.keycode = XKeysymToKeycode (dpy, prefix_key.sym);
+      ev.xkey.state = rp_mask_to_x11_mask (prefix_key.state);
+      ev.xkey.keycode = XKeysymToKeycode (dpy, prefix_key.sym);
     }
-  XSendEvent (dpy, current_window()->w, False, KeyPressMask, &ev1);
+  XSendEvent (dpy, current_window()->w, False, KeyPressMask, &ev);
 
   /*   XTestFakeKeyEvent (dpy, XKeysymToKeycode (dpy, 't'), True, 0); */
 
@@ -3033,7 +3032,6 @@ cmd_resize (int interactive, struct cmdarg **args)
      non-interactive version. */
   if (interactive && args[0] == NULL)
     {
-      int nbytes;
       char buffer[513];
       unsigned int mod;
       KeySym c;
@@ -3056,7 +3054,7 @@ cmd_resize (int interactive, struct cmdarg **args)
           struct resize_binding *binding;
 
           show_frame_message ("Resize frame");
-          nbytes = read_key (&c, &mod, buffer, sizeof (buffer));
+          read_key (&c, &mod, buffer, sizeof (buffer));
 
           /* Convert the mask to be compatible with ratpoison. */
           mod = x11_mask_to_rp_mask (mod);
@@ -3210,9 +3208,6 @@ cmd_ratwarp (int interactive UNUSED, struct cmdarg **args)
 cmdret *
 cmd_ratrelwarp (int interactive UNUSED, struct cmdarg **args)
 {
-  rp_screen *s;
-
-  s = current_screen ();
   XWarpPointer (dpy, None, None, 0, 0, 0, 0, ARG(0,number), ARG(1,number));
   return cmdret_new (RET_SUCCESS, NULL);
 }
diff --git a/src/bar.c b/src/bar.c
index 22dcc92..ef72a87 100644
--- a/src/bar.c
+++ b/src/bar.c
@@ -335,18 +335,11 @@ draw_partial_string (rp_screen *s, char *msg, int line_no, int start, int end, i
 static void
 draw_string (rp_screen *s, char *msg, int mark_start, int mark_end)
 {
-  XGCValues lgv;
-  GC lgc;
-  unsigned long mask;
   size_t i;
   int line_no;
   int start;
   int style = STYLE_NORMAL, update = 0;
 
-  lgv.foreground = s->fg_color;
-  mask = GCForeground;
-  lgc = XCreateGC(dpy, s->root, mask, &lgv);
-
   /* Walk through the string, print each line. */
   start = 0;
   line_no = 0;
diff --git a/src/input.c b/src/input.c
index c8c031e..851e23c 100644
--- a/src/input.c
+++ b/src/input.c
@@ -528,7 +528,6 @@ get_more_input (char *prompt, char *preinput, int history_id,
   /* Emacs 21 uses a 513 byte string to store the keysym name. */
   char keysym_buf[513];
   int keysym_bufsize = sizeof (keysym_buf);
-  int nbytes;
   rp_screen *s = current_screen ();
   KeySym ch;
   unsigned int modifier;
@@ -563,7 +562,7 @@ get_more_input (char *prompt, char *preinput, int history_id,
 
   for (;;)
     {
-      nbytes = read_key (&ch, &modifier, keysym_buf, keysym_bufsize);
+      read_key (&ch, &modifier, keysym_buf, keysym_bufsize);
       modifier = x11_mask_to_rp_mask (modifier);
       PRINT_DEBUG (("ch = %ld, modifier = %d, keysym_buf = %s, keysym_bufsize = %d\n",
                     ch, modifier, keysym_buf, keysym_bufsize));
diff --git a/src/split.c b/src/split.c
index 1a8bf8e..b36b99e 100644
--- a/src/split.c
+++ b/src/split.c
@@ -62,7 +62,6 @@ num_frames (rp_screen *s)
 void
 cleanup_frame (rp_frame *frame)
 {
-  rp_window *last_win;
   rp_window *win;
   rp_screen *screen;
   screen = frames_screen(frame);
@@ -74,7 +73,7 @@ cleanup_frame (rp_frame *frame)
       return;
     }
 
-  last_win = set_frames_window (frame, win);
+  set_frames_window (frame, win);
 
   maximize (win);
   unhide_window (win);
diff --git a/src/window.c b/src/window.c
index 889772c..15024f6 100644
--- a/src/window.c
+++ b/src/window.c
@@ -737,12 +737,11 @@ get_window_list (char *fmt, char *delim, struct sbuf *buffer,
                  int *mark_start, int *mark_end)
 {
   rp_window_elem *we;
-  rp_window *other_window;
 
   if (buffer == NULL) return;
 
   sbuf_clear (buffer);
-  other_window = find_window_other (current_screen());
+  find_window_other (current_screen());
 
   /* We only loop through the current group to look for windows. */
   list_for_each_entry (we,&rp_current_group->mapped_windows,node)