From edc845c0c4d9c326090c075d4d0614c66016c3f4 Mon Sep 17 00:00:00 2001
From: oga
Date: Sun, 11 Jan 2009 21:46:48 +0000
Subject: shortcut_to_name should not be defined as static in a header file.
 Put it in group.c where it it used most, and add an extern definition for the
 other users of it.

Found by gcc -Wall. ok okan@
---
 calmwm.h | 8 ++------
 group.c  | 7 ++++++-
 parse.y  | 4 +---
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/calmwm.h b/calmwm.h
index d2048c8..c5ac95b 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.
  *
- * $Id: calmwm.h,v 1.71 2009/01/11 21:34:22 okan Exp $
+ * $Id: calmwm.h,v 1.72 2009/01/11 21:46:48 oga Exp $
  */
 
 #ifndef _CALMWM_H_
@@ -140,11 +140,7 @@ struct client_ctx {
 
 TAILQ_HEAD(client_ctx_q, client_ctx);
 
-static char *shortcut_to_name[] = {
-	"nogroup", "one", "two", "three",
-	"four", "five", "six", "seven",
-	"eight", "nine"
-};
+extern const char *shortcut_to_name[];
 
 struct group_ctx {
 	TAILQ_ENTRY(group_ctx)	 entry;
diff --git a/group.c b/group.c
index 598bf94..5965c97 100644
--- a/group.c
+++ b/group.c
@@ -16,7 +16,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: group.c,v 1.19 2008/07/18 15:40:52 oga Exp $
+ * $Id: group.c,v 1.20 2009/01/11 21:46:48 oga Exp $
  */
 
 #include "headers.h"
@@ -29,6 +29,11 @@ struct group_ctx	 Groups[CALMWM_NGROUPS];
 int			 Grouphideall = 0;
 struct group_ctx_q	 Groupq;
 
+const char *shortcut_to_name[] = {
+        "nogroup", "one", "two", "three", "four", "five", "six",
+        "seven", "eight", "nine"
+};
+
 static void
 _group_add(struct group_ctx *gc, struct client_ctx *cc)
 {
diff --git a/parse.y b/parse.y
index 194185f..8df0e6e 100644
--- a/parse.y
+++ b/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.14 2009/01/11 21:33:45 okan Exp $ */
+/*	$OpenBSD: parse.y,v 1.15 2009/01/11 21:46:48 oga Exp $ */
 
 /*
  * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -54,8 +54,6 @@ int			 findeol(void);
 
 static struct conf	*conf;
 
-extern char		*shortcut_to_name[];
-
 typedef struct {
 	union {
 		int64_t			 number;
-- 
cgit v1.2.3-2-gb3c3