From 2ad451f1344e65c8fbd8ac23f11f94fceac1c4b1 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Sun, 27 Apr 2014 19:00:26 +0200 Subject: [PATCH] Remove unused variables --- ioncore/group.c | 9 ++------- ioncore/mplex.c | 5 +---- libextl/luaextl.c | 2 +- libtu/errorlog.c | 1 - libtu/rb.c | 3 +-- mod_tiling/split.c | 1 - 6 files changed, 5 insertions(+), 16 deletions(-) diff --git a/ioncore/group.c b/ioncore/group.c index fd12f3fa..2c693b4b 100644 --- a/ioncore/group.c +++ b/ioncore/group.c @@ -298,21 +298,16 @@ void group_managed_remove(WGroup *ws, WRegion *reg) { bool mcf=region_may_control_focus((WRegion*)ws); WStacking *st, *next_st=NULL; - bool was_stdisp=FALSE, was_bottom=FALSE; bool was_current=FALSE; st=group_find_stacking(ws, reg); if(st!=NULL){ - if(st==ws->bottom){ - was_bottom=TRUE; + if(st==ws->bottom) group_do_set_bottom(ws, NULL); - } - if(st==ws->managed_stdisp){ + if(st==ws->managed_stdisp) ws->managed_stdisp=NULL; - was_stdisp=TRUE; - } if(st==ws->current_managed){ ws->current_managed=NULL; diff --git a/ioncore/mplex.c b/ioncore/mplex.c index e5066930..40ab52be 100644 --- a/ioncore/mplex.c +++ b/ioncore/mplex.c @@ -1230,7 +1230,7 @@ bool mplex_do_attach_final(WMPlex *mplex, WRegion *reg, WMPlexPHolder *ph) WStacking *node=NULL; WLListNode *lnode=NULL; WMPlexAttachParams *param=&ph->param; - bool mx_was_empty, sw, modal, mcf, hidden; + bool mx_was_empty, sw, mcf, hidden; WSizePolicy szplcy; uint level; @@ -1245,9 +1245,6 @@ bool mplex_do_attach_final(WMPlex *mplex, WRegion *reg, WMPlexPHolder *ph) ? SIZEPOLICY_FULL_BOUNDS : SIZEPOLICY_FULL_EXACT)); - modal=(param->flags&MPLEX_ATTACH_LEVEL - && param->level>=STACKING_LEVEL_MODAL1); - level=(param->flags&MPLEX_ATTACH_LEVEL ? param->level : (param->flags&MPLEX_ATTACH_UNNUMBERED diff --git a/libextl/luaextl.c b/libextl/luaextl.c index 92995013..178a7260 100644 --- a/libextl/luaextl.c +++ b/libextl/luaextl.c @@ -2052,7 +2052,7 @@ typedef struct{ static bool extl_do_register_function(lua_State *st, RegData *data) { - ExtlExportedFnSpec *spec=data->spec, *spec2; + ExtlExportedFnSpec *spec=data->spec; #if LUA_VERSION_NUM>=502 int ind; #else diff --git a/libtu/errorlog.c b/libtu/errorlog.c index f2b787aa..2bb22355 100644 --- a/libtu/errorlog.c +++ b/libtu/errorlog.c @@ -70,7 +70,6 @@ static void log_warn_handler(const char *message) { const char *p=strchr(message, '\n'); static int lineno=0; - int alternat=0; add_to_log(current_log, lineno==0 ? ">> " : " ", 3); diff --git a/libtu/rb.c b/libtu/rb.c index 2e5006a1..01be5166 100644 --- a/libtu/rb.c +++ b/libtu/rb.c @@ -248,7 +248,7 @@ Rb_node rb_find_pkey(Rb_node n, const void *key) Rb_node rb_insert_b(Rb_node n, const void *key, void *val) { - Rb_node newleft, newright, newnode, list, p; + Rb_node newleft, newright, newnode, p; if (ishead(n)) { if (n->p.root == n) { /* Tree is empty */ @@ -328,7 +328,6 @@ static void single_rotate(Rb_node y, int l) { int rl=0, ir=0; Rb_node x=NULL, yp=NULL; - void *tmp=NULL; ir = isroot(y); yp = y->p.parent; diff --git a/mod_tiling/split.c b/mod_tiling/split.c index 25b66b6a..a209e3a7 100644 --- a/mod_tiling/split.c +++ b/mod_tiling/split.c @@ -930,7 +930,6 @@ bool update_geom_from_stdisp(WFrame *frame, WRectangle *ng, int dir) WSplitST *st; WRectangle stg; WRectangle rstg; - WRectangle ngr; int ori; if(!OBJ_IS(ws, WTiling) || ((WTiling*)ws)->stdispnode==NULL) -- 2.11.4.GIT