aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorokan2012-12-19 15:21:34 +0000
committerokan2012-12-19 15:21:34 +0000
commitc5eb66fdce461930b3b780e5f09b0f3771474825 (patch)
tree4cc61e19c89264395d99c4d873fb63965667273f
parentb383e573a5430c56c75ab469210bbe714c0d83b5 (diff)
downloadcwm-c5eb66fdce461930b3b780e5f09b0f3771474825.tar.gz
gc unused cmd 'flags' variable
Diffstat (limited to '')
-rw-r--r--calmwm.h5
-rw-r--r--conf.c5
-rw-r--r--parse.y4
3 files changed, 6 insertions, 8 deletions
diff --git a/calmwm.h b/calmwm.h
index 14370aa..3b26df3 100644
--- a/calmwm.h
+++ b/calmwm.h
@@ -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.
*
- * $OpenBSD: calmwm.h,v 1.178 2012/12/18 18:39:55 okan Exp $
+ * $OpenBSD: calmwm.h,v 1.179 2012/12/19 15:21:34 okan Exp $
*/
#ifndef _CALMWM_H_
@@ -257,7 +257,6 @@ TAILQ_HEAD(mousebinding_q, mousebinding);
struct cmd {
TAILQ_ENTRY(cmd) entry;
- int flags;
char image[MAXPATHLEN];
#define CMD_MAXLABELLEN 256
char label[CMD_MAXLABELLEN];
@@ -437,7 +436,7 @@ int parse_config(const char *, struct conf *);
void conf_bindname(struct conf *, char *, char *);
void conf_clear(struct conf *);
void conf_client(struct client_ctx *);
-void conf_cmd_add(struct conf *, char *, char *, int);
+void conf_cmd_add(struct conf *, char *, char *);
void conf_color(struct conf *, struct screen_ctx *);
void conf_font(struct conf *, struct screen_ctx *);
void conf_gap(struct conf *, struct screen_ctx *);
diff --git a/conf.c b/conf.c
index dd705e0..cdf9acb 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.
*
- * $OpenBSD: conf.c,v 1.115 2012/12/18 00:14:41 okan Exp $
+ * $OpenBSD: conf.c,v 1.116 2012/12/19 15:21:34 okan Exp $
*/
#include <sys/param.h>
@@ -36,7 +36,7 @@ static void conf_unbind(struct conf *, struct keybinding *);
/* Add an command menu entry to the end of the menu */
void
-conf_cmd_add(struct conf *c, char *image, char *label, int flags)
+conf_cmd_add(struct conf *c, char *image, char *label)
{
/* "term" and "lock" have special meanings. */
@@ -46,7 +46,6 @@ conf_cmd_add(struct conf *c, char *image, char *label, int flags)
(void)strlcpy(c->lockpath, image, sizeof(c->lockpath));
else {
struct cmd *cmd = xmalloc(sizeof(*cmd));
- cmd->flags = flags;
(void)strlcpy(cmd->image, image, sizeof(cmd->image));
(void)strlcpy(cmd->label, label, sizeof(cmd->label));
TAILQ_INSERT_TAIL(&c->cmdq, cmd, entry);
diff --git a/parse.y b/parse.y
index 238bebc..5fc0146 100644
--- a/parse.y
+++ b/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.36 2012/12/17 02:53:29 okan Exp $ */
+/* $OpenBSD: parse.y,v 1.37 2012/12/19 15:21:34 okan Exp $ */
/*
* Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -126,7 +126,7 @@ main : FONTNAME STRING {
conf->snapdist = $2;
}
| COMMAND STRING string {
- conf_cmd_add(conf, $3, $2, 0);
+ conf_cmd_add(conf, $3, $2);
free($2);
free($3);
}