From d40fa69b92546a8da44e531ba3974f30ca8a59c0 Mon Sep 17 00:00:00 2001 From: Christophe CURIS Date: Sat, 4 May 2013 15:43:23 +0200 Subject: [PATCH] WUtil: Added 'const' attribute to the filename on WM(Read|Write)PropList* Note that the argument is also stored as-is in the PLData structure but only for debugging purpose (warning display to user), hence the choice to not duplicate it. As a side effect, it was 'const'-ified too to reflect that. --- WINGs/WINGs/WUtil.h | 6 +++--- WINGs/proplist.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/WINGs/WINGs/WUtil.h b/WINGs/WINGs/WUtil.h index 78c38ae8..6c26f612 100644 --- a/WINGs/WINGs/WUtil.h +++ b/WINGs/WINGs/WUtil.h @@ -805,11 +805,11 @@ WMPropList* WMCreatePropListFromDescription(char *desc); /* Free the returned string when you no longer need it */ char* WMGetPropListDescription(WMPropList *plist, Bool indented); -WMPropList* WMReadPropListFromFile(char *file); +WMPropList* WMReadPropListFromFile(const char *file); -WMPropList* WMReadPropListFromPipe(char *command); +WMPropList* WMReadPropListFromPipe(const char *command); -Bool WMWritePropListToFile(WMPropList *plist, char *path); +Bool WMWritePropListToFile(WMPropList *plist, const char *path); /* ---[ WINGs/userdefaults.c ]-------------------------------------------- */ diff --git a/WINGs/proplist.c b/WINGs/proplist.c index ee805000..7e8ff2c3 100644 --- a/WINGs/proplist.c +++ b/WINGs/proplist.c @@ -38,7 +38,7 @@ typedef struct W_PropList { typedef struct PLData { char *ptr; int pos; - char *filename; + const char *filename; int lineNumber; } PLData; @@ -1485,7 +1485,7 @@ char *WMGetPropListDescription(WMPropList * plist, Bool indented) return (indented ? indentedDescription(plist, 0) : description(plist)); } -WMPropList *WMReadPropListFromFile(char *file) +WMPropList *WMReadPropListFromFile(const char *file) { WMPropList *plist = NULL; PLData *pldata; @@ -1545,7 +1545,7 @@ WMPropList *WMReadPropListFromFile(char *file) return plist; } -WMPropList *WMReadPropListFromPipe(char *command) +WMPropList *WMReadPropListFromPipe(const char *command) { FILE *file; WMPropList *plist; @@ -1601,7 +1601,7 @@ WMPropList *WMReadPropListFromPipe(char *command) /* TODO: review this function's code */ -Bool WMWritePropListToFile(WMPropList * plist, char *path) +Bool WMWritePropListToFile(WMPropList * plist, const char *path) { char *thePath = NULL; char *desc; -- 2.11.4.GIT