From 8517f3dcef46a25e3c3f6dc9d7370f77551ede2f Mon Sep 17 00:00:00 2001 From: Christophe CURIS Date: Wed, 8 May 2013 15:44:07 +0200 Subject: [PATCH] WPrefs: Added the proper 'const' attribute to the dictionnary functions A common argument to all these functions is the name of the key to operate on, and this name is never modified by the functions. Marking it as const reflects this, and can allow compiler to generate better results thanks to this info. --- WPrefs.app/WPrefs.c | 26 +++++++++++++------------- WPrefs.app/WPrefs.h | 22 +++++++++++----------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/WPrefs.app/WPrefs.c b/WPrefs.app/WPrefs.c index 94b248fe..413bee94 100644 --- a/WPrefs.app/WPrefs.c +++ b/WPrefs.app/WPrefs.c @@ -815,7 +815,7 @@ static void loadConfigurations(WMScreen * scr, WMWindow * mainw) WindowMakerDB = db; } -WMPropList *GetObjectForKey(char *defaultName) +WMPropList *GetObjectForKey(const char *defaultName) { WMPropList *object = NULL; WMPropList *key = WMCreatePLString(defaultName); @@ -829,7 +829,7 @@ WMPropList *GetObjectForKey(char *defaultName) return object; } -void SetObjectForKey(WMPropList * object, char *defaultName) +void SetObjectForKey(WMPropList * object, const char *defaultName) { WMPropList *key = WMCreatePLString(defaultName); @@ -837,7 +837,7 @@ void SetObjectForKey(WMPropList * object, char *defaultName) WMReleasePropList(key); } -void RemoveObjectForKey(char *defaultName) +void RemoveObjectForKey(const char *defaultName) { WMPropList *key = WMCreatePLString(defaultName); @@ -846,7 +846,7 @@ void RemoveObjectForKey(char *defaultName) WMReleasePropList(key); } -char *GetStringForKey(char *defaultName) +char *GetStringForKey(const char *defaultName) { WMPropList *val; @@ -861,7 +861,7 @@ char *GetStringForKey(char *defaultName) return WMGetFromPLString(val); } -WMPropList *GetArrayForKey(char *defaultName) +WMPropList *GetArrayForKey(const char *defaultName) { WMPropList *val; @@ -876,7 +876,7 @@ WMPropList *GetArrayForKey(char *defaultName) return val; } -WMPropList *GetDictionaryForKey(char *defaultName) +WMPropList *GetDictionaryForKey(const char *defaultName) { WMPropList *val; @@ -891,7 +891,7 @@ WMPropList *GetDictionaryForKey(char *defaultName) return val; } -int GetIntegerForKey(char *defaultName) +int GetIntegerForKey(const char *defaultName) { WMPropList *val; char *str; @@ -915,7 +915,7 @@ int GetIntegerForKey(char *defaultName) return value; } -Bool GetBoolForKey(char *defaultName) +Bool GetBoolForKey(const char *defaultName) { int value; char *str; @@ -937,7 +937,7 @@ Bool GetBoolForKey(char *defaultName) return False; } -void SetIntegerForKey(int value, char *defaultName) +void SetIntegerForKey(int value, const char *defaultName) { WMPropList *object; char buffer[128]; @@ -949,7 +949,7 @@ void SetIntegerForKey(int value, char *defaultName) WMReleasePropList(object); } -void SetStringForKey(char *value, char *defaultName) +void SetStringForKey(char *value, const char *defaultName) { WMPropList *object; @@ -959,7 +959,7 @@ void SetStringForKey(char *value, char *defaultName) WMReleasePropList(object); } -void SetBoolForKey(Bool value, char *defaultName) +void SetBoolForKey(Bool value, const char *defaultName) { static WMPropList *yes = NULL, *no = NULL; @@ -971,7 +971,7 @@ void SetBoolForKey(Bool value, char *defaultName) SetObjectForKey(value ? yes : no, defaultName); } -void SetSpeedForKey(int speed, char *defaultName) +void SetSpeedForKey(int speed, const char *defaultName) { char *str; @@ -999,7 +999,7 @@ void SetSpeedForKey(int speed, char *defaultName) SetStringForKey(str, defaultName); } -int GetSpeedForKey(char *defaultName) +int GetSpeedForKey(const char *defaultName) { char *str; int i; diff --git a/WPrefs.app/WPrefs.h b/WPrefs.app/WPrefs.h index 5100ef66..6cc02b75 100644 --- a/WPrefs.app/WPrefs.h +++ b/WPrefs.app/WPrefs.h @@ -87,27 +87,27 @@ WMWindow *GetWindow(Panel *panel); /* manipulate the dictionary for the WindowMaker domain */ -WMPropList *GetObjectForKey(char *defaultName); +WMPropList *GetObjectForKey(const char *defaultName); -void SetObjectForKey(WMPropList *object, char *defaultName); +void SetObjectForKey(WMPropList *object, const char *defaultName); -void RemoveObjectForKey(char *defaultName); +void RemoveObjectForKey(const char *defaultName); -char *GetStringForKey(char *defaultName); +char *GetStringForKey(const char *defaultName); -int GetIntegerForKey(char *defaultName); +int GetIntegerForKey(const char *defaultName); -Bool GetBoolForKey(char *defaultName); +Bool GetBoolForKey(const char *defaultName); -int GetSpeedForKey(char *defaultName); +int GetSpeedForKey(const char *defaultName); -void SetIntegerForKey(int value, char *defaultName); +void SetIntegerForKey(int value, const char *defaultName); -void SetStringForKey(char *value, char *defaultName); +void SetStringForKey(char *value, const char *defaultName); -void SetBoolForKey(Bool value, char *defaultName); +void SetBoolForKey(Bool value, const char *defaultName); -void SetSpeedForKey(int speed, char *defaultName); +void SetSpeedForKey(int speed, const char *defaultName); -- 2.11.4.GIT