[hackers] [wmii] Fix compiler warnings. || Kris Maglione

changeset: 2790:95951abe29c5
tag: tip
user: Kris Maglione <kris_AT_suckless.org>
date: Wed Sep 14 17:45:29 2011 -0400
files: cmd/tray/main.c cmd/wmii/client.c cmd/wmii/column.c cmd/wmii/ewmh.c cmd/wmii/frame.c cmd/wmii/fs.c cmd/wmii/key.c cmd/wmii/layout.c cmd/wmii/stack.c
description:
Fix compiler warnings.

diff -r 6f86238354a4 -r 95951abe29c5 cmd/tray/main.c
--- a/cmd/tray/main.c Sat Sep 03 07:49:40 2011 -0400
+++ b/cmd/tray/main.c Wed Sep 14 17:45:29 2011 -0400
@@ -188,7 +188,7 @@
         xext_init();
         tray_init();
 
- client_init(nil);
+ client_init(address);
 
         if(tray.edge == 0)
                 tray.edge = West | (!strcmp(readctl("/ctl", "bar on "), "top") ? North : South);
diff -r 6f86238354a4 -r 95951abe29c5 cmd/wmii/client.c
--- a/cmd/wmii/client.c Sat Sep 03 07:49:40 2011 -0400
+++ b/cmd/wmii/client.c Wed Sep 14 17:45:29 2011 -0400
@@ -251,7 +251,6 @@
 void
 client_manage(Client *c) {
         Client *leader;
- Frame *f;
         char *tags;
         bool dotags;
 
@@ -290,17 +289,17 @@
                         && !client_viewframe(group_leader(c->group),
                                              c->sel->view);
 
- f = c->sel;
+ /* f = c->sel; */
         if(!(c->w.ewmh.type & TypeSplash))
- if(newgroup) {
- /* XXX: Look over this.
- if(f->area != f->view->sel)
- f->view->oldsel = f->view->sel;
- */
- }else {
- frame_restack(c->sel, c->sel->area->sel);
- view_restack(c->sel->view);
- }
+ if(newgroup) {
+ /* XXX: Look over this.
+ if(f->area != f->view->sel)
+ f->view->oldsel = f->view->sel;
+ */
+ }else {
+ frame_restack(c->sel, c->sel->area->sel);
+ view_restack(c->sel->view);
+ }
 }
 
 void
@@ -874,7 +873,7 @@
 /* Handlers */
 static bool
 configreq_event(Window *w, void *aux, XConfigureRequestEvent *e) {
- Rectangle r, cr;
+ Rectangle r;
         Client *c;
 
         c = aux;
@@ -895,7 +894,6 @@
                 c->border = e->border_width;
 
         r.max = addpt(r.min, r.max);
- cr = r;
         r = client_grav(c, r);
 
         if(c->sel->area->floating)
diff -r 6f86238354a4 -r 95951abe29c5 cmd/wmii/column.c
--- a/cmd/wmii/column.c Sat Sep 03 07:49:40 2011 -0400
+++ b/cmd/wmii/column.c Wed Sep 14 17:45:29 2011 -0400
@@ -143,14 +143,15 @@
 void
 column_attachrect(Area *a, Frame *f, Rectangle r) {
         Frame *fp, *pos;
- int before, after;
 
         pos = nil;
         for(fp=a->frame; fp; pos=fp, fp=fp->anext) {
                 if(r.max.y < fp->r.min.y || r.min.y > fp->r.max.y)
                         continue;
+ /*
                 before = fp->r.min.y - r.min.y;
                 after = -fp->r.max.y + r.max.y;
+ */
         }
         column_insert(a, f, pos);
         column_resizeframe_h(f, r);
diff -r 6f86238354a4 -r 95951abe29c5 cmd/wmii/ewmh.c
--- a/cmd/wmii/ewmh.c Sat Sep 03 07:49:40 2011 -0400
+++ b/cmd/wmii/ewmh.c Wed Sep 14 17:45:29 2011 -0400
@@ -188,11 +188,9 @@
 
 void
 ewmh_destroyclient(Client *c) {
- Ewmh *e;
 
         ewmh_updateclientlist();
 
- e = &c->w.ewmh;
         free(c->strut);
 }
 
diff -r 6f86238354a4 -r 95951abe29c5 cmd/wmii/frame.c
--- a/cmd/wmii/frame.c Sat Sep 03 07:49:40 2011 -0400
+++ b/cmd/wmii/frame.c Wed Sep 14 17:45:29 2011 -0400
@@ -96,10 +96,8 @@
 
 bool
 frame_restack(Frame *f, Frame *above) {
- Client *c;
         Area *a;
 
- c = f->client;
         a = f->area;
         if(!a->floating)
                 return false;
diff -r 6f86238354a4 -r 95951abe29c5 cmd/wmii/fs.c
--- a/cmd/wmii/fs.c Sat Sep 03 07:49:40 2011 -0400
+++ b/cmd/wmii/fs.c Wed Sep 14 17:45:29 2011 -0400
@@ -523,7 +523,7 @@
                                          t->max);
                 else
                         goto done;
- ixp_respond(r, nil);
+ ixp_respond(r, errstr);
                 found++;
         }
 done:
diff -r 6f86238354a4 -r 95951abe29c5 cmd/wmii/key.c
--- a/cmd/wmii/key.c Sat Sep 03 07:49:40 2011 -0400
+++ b/cmd/wmii/key.c Wed Sep 14 17:45:29 2011 -0400
@@ -135,7 +135,7 @@
 static Key *
 match_keys(Key *k, ulong mod, KeyCode keycode, bool seq) {
         Key *ret, *next;
- volatile int i; /* shut up ken */
+ int i; /* shut up ken */
 
         ret = nil;
         for(next = k->tnext; k; i = (k=next) && (next=k->tnext)) {
@@ -146,6 +146,7 @@
                         ret = k;
                 }
         }
+ USED(i);
         return ret;
 }
 
diff -r 6f86238354a4 -r 95951abe29c5 cmd/wmii/layout.c
--- a/cmd/wmii/layout.c Sat Sep 03 07:49:40 2011 -0400
+++ b/cmd/wmii/layout.c Wed Sep 14 17:45:29 2011 -0400
@@ -147,12 +147,9 @@
         Rectangle r;
         Frame *f;
         Area *a;
- View *v;
         long l;
         int hr;
 
- v = selview;
-
         a = find_area(pt);
         if(a == nil)
                 return;
@@ -200,11 +197,8 @@
 static void
 hplace(Framewin *fw, Point pt) {
         Area *a;
- View *v;
         int minw;
 
- v = selview;
-
         a = find_area(pt);
         if(a == nil)
                 return; /* XXX: Multihead. */
diff -r 6f86238354a4 -r 95951abe29c5 cmd/wmii/stack.c
--- a/cmd/wmii/stack.c Sat Sep 03 07:49:40 2011 -0400
+++ b/cmd/wmii/stack.c Wed Sep 14 17:45:29 2011 -0400
@@ -7,14 +7,12 @@
 void
 stack_scale(Frame *first, int height) {
         Frame *f;
- Area *a;
         uint dy;
         int surplus;
 
- a = first->area;
-
         /*
          * Will need something like this.
+ a = first->area;
         column_fit(a, &ncol, &nuncol);
         */
 
Received on Wed Sep 14 2011 - 23:45:42 CEST