openbsd/xenocara
1
0
Fork 0
mirror of https://github.com/openbsd/xenocara.git synced 2025-12-14 05:08:53 +00:00
Code Issues Projects Releases Wiki Activity

shortcut_to_name should not be defined as static in a header file. Put

Browse Source 
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@
This commit is contained in:
oga
2009-01-11 21:46:48 +00:00
parent 331aeae1e7
commit b1941d120c
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/cwm/calmwm.h
View File

@@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * 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_ #ifndef _CALMWM_H_
@@ -140,11 +140,7 @@ struct client_ctx {
TAILQ_HEAD(client_ctx_q, client_ctx); TAILQ_HEAD(client_ctx_q, client_ctx);
static char *shortcut_to_name[] = { extern const char *shortcut_to_name[];
"nogroup", "one", "two", "three",
"four", "five", "six", "seven",
"eight", "nine"
};
struct group_ctx { struct group_ctx {
TAILQ_ENTRY(group_ctx) entry; TAILQ_ENTRY(group_ctx) entry;

7
app/cwm/group.c
View File

@@ -16,7 +16,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * 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" #include "headers.h"
@@ -29,6 +29,11 @@ struct group_ctx Groups[CALMWM_NGROUPS];
int Grouphideall = 0; int Grouphideall = 0;
struct group_ctx_q Groupq; struct group_ctx_q Groupq;
const char *shortcut_to_name[] = {
"nogroup", "one", "two", "three", "four", "five", "six",
"seven", "eight", "nine"
};
static void static void
_group_add(struct group_ctx *gc, struct client_ctx *cc) _group_add(struct group_ctx *gc, struct client_ctx *cc)
{ {

4
app/cwm/parse.y
View File

@@ -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> * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -54,8 +54,6 @@ int findeol(void);
static struct conf *conf; static struct conf *conf;
extern char *shortcut_to_name[];
typedef struct { typedef struct {
union { union {
int64_t number; int64_t number;