aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--client.c5
-rw-r--r--conf.c21
2 files changed, 12 insertions, 14 deletions
diff --git a/client.c b/client.c
index ffa8922..35a7614 100644
--- a/client.c
+++ b/client.c
@@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: client.c,v 1.46 2009/01/22 19:01:56 okan Exp $
+ * $Id: client.c,v 1.47 2009/01/23 20:47:45 okan Exp $
*/
#include "headers.h"
@@ -699,8 +699,7 @@ client_freehints(struct client_ctx *cc)
XFree(cc->app_name);
if (cc->app_class != NULL)
XFree(cc->app_class);
- if (cc->app_cliarg != NULL)
- xfree(cc->app_cliarg);
+ xfree(cc->app_cliarg);
}
static int
diff --git a/conf.c b/conf.c
index 22e6605..554748c 100644
--- a/conf.c
+++ b/conf.c
@@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: conf.c,v 1.55 2009/01/23 19:00:59 okan Exp $
+ * $Id: conf.c,v 1.56 2009/01/23 20:47:45 okan Exp $
*/
#include "headers.h"
@@ -170,35 +170,34 @@ conf_clear(struct conf *c)
while ((cmd = TAILQ_FIRST(&c->cmdq)) != NULL) {
TAILQ_REMOVE(&c->cmdq, cmd, entry);
- free(cmd);
+ xfree(cmd);
}
while ((kb = TAILQ_FIRST(&c->keybindingq)) != NULL) {
TAILQ_REMOVE(&c->keybindingq, kb, entry);
- free(kb);
+ xfree(kb);
}
while ((ag = TAILQ_FIRST(&c->autogroupq)) != NULL) {
TAILQ_REMOVE(&c->autogroupq, ag, entry);
- free(ag->class);
+ xfree(ag->class);
if (ag->name)
- free(ag->name);
- free(ag->group);
- free(ag);
+ xfree(ag->name);
+ xfree(ag->group);
+ xfree(ag);
}
while ((wm = TAILQ_FIRST(&c->ignoreq)) != NULL) {
TAILQ_REMOVE(&c->ignoreq, wm, entry);
- free(wm);
+ xfree(wm);
}
while ((mb = TAILQ_FIRST(&c->mousebindingq)) != NULL) {
TAILQ_REMOVE(&c->mousebindingq, mb, entry);
- free(mb);
+ xfree(mb);
}
- if (c->DefaultFontName != NULL)
- free(c->DefaultFontName);
+ xfree(c->DefaultFontName);
}
void