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@
This commit is contained in:
oga 2009-01-11 21:46:48 +00:00
parent dcfae161a2
commit d1050afb60
3 changed files with 6 additions and 7 deletions

View File

@ -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;

View File

@ -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)
{ {

View File

@ -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;