From 5fcf15f0d5705cda9117da674b55d2bbbc4b3f62 Mon Sep 17 00:00:00 2001 From: Christophe CURIS Date: Sun, 30 Jun 2013 16:02:39 +0200 Subject: [PATCH] wmaker: Changed global constant declaration to use appropriate type The original type was not as safe as it looked like to be, and led to more memory usage than necessary. Signed-off-by: Christophe CURIS --- src/WindowMaker.h | 29 +++++++++++++++-------------- src/main.c | 28 ++++++++++++++-------------- 2 files changed, 29 insertions(+), 28 deletions(-) diff --git a/src/WindowMaker.h b/src/WindowMaker.h index 69923c1c..21e6ff16 100644 --- a/src/WindowMaker.h +++ b/src/WindowMaker.h @@ -455,18 +455,19 @@ extern char WProgramState; extern char WProgramSigState; /****** Notifications ******/ -extern const char *WMNManaged; -extern const char *WMNUnmanaged; -extern const char *WMNChangedWorkspace; -extern const char *WMNChangedState; -extern const char *WMNChangedFocus; -extern const char *WMNChangedStacking; -extern const char *WMNChangedName; - -extern const char *WMNWorkspaceCreated; -extern const char *WMNWorkspaceDestroyed; -extern const char *WMNWorkspaceChanged; -extern const char *WMNWorkspaceNameChanged; - -extern const char *WMNResetStacking; +extern const char WMNManaged[]; +extern const char WMNUnmanaged[]; +extern const char WMNChangedWorkspace[]; +extern const char WMNChangedState[]; +extern const char WMNChangedFocus[]; +extern const char WMNChangedStacking[]; +extern const char WMNChangedName[]; + +extern const char WMNWorkspaceCreated[]; +extern const char WMNWorkspaceDestroyed[]; +extern const char WMNWorkspaceChanged[]; +extern const char WMNWorkspaceNameChanged[]; + +extern const char WMNResetStacking[]; + #endif diff --git a/src/main.c b/src/main.c index 199033e7..69a68e22 100644 --- a/src/main.c +++ b/src/main.c @@ -150,20 +150,20 @@ char WProgramState = WSTATE_NORMAL; char WDelayedActionSet = 0; /* notifications */ -const char *WMNManaged = "WMNManaged"; -const char *WMNUnmanaged = "WMNUnmanaged"; -const char *WMNChangedWorkspace = "WMNChangedWorkspace"; -const char *WMNChangedState = "WMNChangedState"; -const char *WMNChangedFocus = "WMNChangedFocus"; -const char *WMNChangedStacking = "WMNChangedStacking"; -const char *WMNChangedName = "WMNChangedName"; - -const char *WMNWorkspaceCreated = "WMNWorkspaceCreated"; -const char *WMNWorkspaceDestroyed = "WMNWorkspaceDestroyed"; -const char *WMNWorkspaceChanged = "WMNWorkspaceChanged"; -const char *WMNWorkspaceNameChanged = "WMNWorkspaceNameChanged"; - -const char *WMNResetStacking = "WMNResetStacking"; +const char WMNManaged[] = "WMNManaged"; +const char WMNUnmanaged[] = "WMNUnmanaged"; +const char WMNChangedWorkspace[] = "WMNChangedWorkspace"; +const char WMNChangedState[] = "WMNChangedState"; +const char WMNChangedFocus[] = "WMNChangedFocus"; +const char WMNChangedStacking[] = "WMNChangedStacking"; +const char WMNChangedName[] = "WMNChangedName"; + +const char WMNWorkspaceCreated[] = "WMNWorkspaceCreated"; +const char WMNWorkspaceDestroyed[] = "WMNWorkspaceDestroyed"; +const char WMNWorkspaceChanged[] = "WMNWorkspaceChanged"; +const char WMNWorkspaceNameChanged[] = "WMNWorkspaceNameChanged"; + +const char WMNResetStacking[] = "WMNResetStacking"; /******** End Global Variables *****/ -- 2.11.4.GIT