From: Christophe CURIS <[email protected]>
This makes both the API and local function const-correct on their
input parameters.
---
WINGs/WINGs/WINGs.h | 10 +++++-----
WINGs/wbrowser.c | 10 +++++-----
WINGs/wcolorpanel.c | 8 ++++----
WINGs/wfilepanel.c | 16 ++++++++--------
WINGs/wfontpanel.c | 16 ++++++++--------
5 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/WINGs/WINGs/WINGs.h b/WINGs/WINGs/WINGs.h
index ba7e536..e183286 100644
--- a/WINGs/WINGs/WINGs.h
+++ b/WINGs/WINGs/WINGs.h
@@ -1248,7 +1248,7 @@ void WMSetBrowserAllowMultipleSelection(WMBrowser *bPtr,
Bool flag);
void WMSetBrowserAllowEmptySelection(WMBrowser *bPtr, Bool flag);
-void WMSetBrowserPathSeparator(WMBrowser *bPtr, char *separator);
+void WMSetBrowserPathSeparator(WMBrowser *bPtr, const char *separator);
void WMSetBrowserTitled(WMBrowser *bPtr, Bool flag);
@@ -1260,9 +1260,9 @@ void WMRemoveBrowserItem(WMBrowser *bPtr, int column, int
row);
void WMSetBrowserMaxVisibleColumns(WMBrowser *bPtr, int columns);
-void WMSetBrowserColumnTitle(WMBrowser *bPtr, int column, char *title);
+void WMSetBrowserColumnTitle(WMBrowser *bPtr, int column, const char *title);
-WMListItem* WMInsertBrowserItem(WMBrowser *bPtr, int column, int row, char
*text, Bool isBranch);
+WMListItem* WMInsertBrowserItem(WMBrowser *bPtr, int column, int row, const
char *text, Bool isBranch);
void WMSortBrowserColumn(WMBrowser *bPtr, int column);
@@ -1806,7 +1806,7 @@ char* WMGetFilePanelFileName(WMFilePanel *panel);
void WMFreeFilePanel(WMFilePanel *panel);
int WMRunModalFilePanelForDirectory(WMFilePanel *panel, WMWindow *owner,
- char *path, char *name, char **fileTypes);
+ char *path, const char *name, char
**fileTypes);
void WMSetFilePanelAccessoryView(WMFilePanel *panel, WMView *view);
@@ -1826,7 +1826,7 @@ void WMFreeFontPanel(WMFontPanel *panel);
void WMSetFontPanelAction(WMFontPanel *panel, WMAction2 *action, void *data);
-void WMSetFontPanelFont(WMFontPanel *panel, char *fontName);
+void WMSetFontPanelFont(WMFontPanel *panel, const char *fontName);
WMFont* WMGetFontPanelFont(WMFontPanel *panel);
diff --git a/WINGs/wbrowser.c b/WINGs/wbrowser.c
index 745811a..594e81c 100644
--- a/WINGs/wbrowser.c
+++ b/WINGs/wbrowser.c
@@ -75,7 +75,7 @@ static void loadColumn(WMBrowser * bPtr, int column);
static void removeColumn(WMBrowser * bPtr, int column);
-static char *createTruncatedString(WMFont * font, char *text, int *textLen,
int width);
+static char *createTruncatedString(WMFont * font, const char *text, int
*textLen, int width);
static void willResizeBrowser(W_ViewDelegate *, WMView *, unsigned int *,
unsigned int *);
@@ -220,7 +220,7 @@ int WMGetBrowserNumberOfColumns(WMBrowser * bPtr)
return bPtr->usedColumnCount;
}
-void WMSetBrowserPathSeparator(WMBrowser * bPtr, char *separator)
+void WMSetBrowserPathSeparator(WMBrowser * bPtr, const char *separator)
{
if (bPtr->pathSeparator)
wfree(bPtr->pathSeparator);
@@ -350,7 +350,7 @@ int WMGetBrowserSelectedRowInColumn(WMBrowser * bPtr, int
column)
}
}
-void WMSetBrowserColumnTitle(WMBrowser * bPtr, int column, char *title)
+void WMSetBrowserColumnTitle(WMBrowser * bPtr, int column, const char *title)
{
assert(column >= 0);
assert(column < bPtr->usedColumnCount);
@@ -414,7 +414,7 @@ void WMSortBrowserColumnWithComparer(WMBrowser * bPtr, int
column, WMCompareData
WMSortListItemsWithComparer(bPtr->columns[column], func);
}
-WMListItem *WMInsertBrowserItem(WMBrowser * bPtr, int column, int row, char
*text, Bool isBranch)
+WMListItem *WMInsertBrowserItem(WMBrowser * bPtr, int column, int row, const
char *text, Bool isBranch)
{
WMListItem *item;
@@ -1116,7 +1116,7 @@ static void destroyBrowser(WMBrowser * bPtr)
wfree(bPtr);
}
-static char *createTruncatedString(WMFont * font, char *text, int *textLen,
int width)
+static char *createTruncatedString(WMFont * font, const char *text, int
*textLen, int width)
{
size_t slen;
int dLen;
diff --git a/WINGs/wcolorpanel.c b/WINGs/wcolorpanel.c
index 0586766..989250e 100644
--- a/WINGs/wcolorpanel.c
+++ b/WINGs/wcolorpanel.c
@@ -275,7 +275,7 @@ enum {
#define M_PI 3.14159265358979323846
#endif
-char *generateNewFilename(char *curName);
+char *generateNewFilename(const char *curName);
void convertCPColor(CPColor * color);
RColor ulongToRColor(WMScreen * scr, unsigned long value);
unsigned char getShift(unsigned char value);
@@ -360,7 +360,7 @@ void WMSetColorPanelAction(WMColorPanel * panel, WMAction2
* action, void *data)
panel->clientData = data;
}
-static WMColorPanel *makeColorPanel(WMScreen * scrPtr, char *name)
+static WMColorPanel *makeColorPanel(WMScreen * scrPtr, const char *name)
{
WMColorPanel *panel;
RImage *image;
@@ -3336,12 +3336,12 @@ static void hsbInit(W_ColorPanel * panel)
/************************** Common utility functions ************************/
-char *generateNewFilename(char *curName)
+char *generateNewFilename(const char *curName)
{
int n;
char c;
int baseLen;
- char *ptr;
+ const char *ptr;
char *newName;
assert(curName);
diff --git a/WINGs/wfilepanel.c b/WINGs/wfilepanel.c
index 660ce34..372683f 100644
--- a/WINGs/wfilepanel.c
+++ b/WINGs/wfilepanel.c
@@ -62,7 +62,7 @@ typedef struct W_FilePanel {
#define PWIDTH 330
#define PHEIGHT 360
-static void listDirectoryOnColumn(WMFilePanel * panel, int column, char *path);
+static void listDirectoryOnColumn(WMFilePanel * panel, int column, const char
*path);
static void browserClick();
static void browserDClick();
@@ -94,7 +94,7 @@ static WMBrowserDelegate browserDelegate = {
NULL /* willScroll */
};
-static int closestListItem(WMList * list, char *text, Bool exact)
+static int closestListItem(WMList * list, const char *text, Bool exact)
{
WMListItem *item;
WMArray *items = WMGetListItems(list);
@@ -166,7 +166,7 @@ static void textEditedObserver(void *observerData,
WMNotification * notification
}
}
-static WMFilePanel *makeFilePanel(WMScreen * scrPtr, char *name, char *title)
+static WMFilePanel *makeFilePanel(WMScreen * scrPtr, const char *name, const
char *title)
{
WMFilePanel *fPtr;
WMFont *largeFont;
@@ -348,7 +348,7 @@ void WMFreeFilePanel(WMFilePanel * panel)
}
int
-WMRunModalFilePanelForDirectory(WMFilePanel * panel, WMWindow * owner, char
*path, char *name, char **fileTypes)
+WMRunModalFilePanelForDirectory(WMFilePanel * panel, WMWindow * owner, char
*path, const char *name, char **fileTypes)
{
WMScreen *scr = WMWidgetScreen(panel->win);
@@ -454,7 +454,7 @@ WMView *WMGetFilePanelAccessoryView(WMFilePanel * panel)
return panel->accessoryView;
}
-static char *get_name_from_path(char *path)
+static char *get_name_from_path(const char *path)
{
int size;
@@ -475,7 +475,7 @@ static char *get_name_from_path(char *path)
return wstrdup(&(path[size]));
}
-static int filterFileName(WMFilePanel * panel, char *file, Bool isDirectory)
+static int filterFileName(WMFilePanel * panel, const char *file, Bool
isDirectory)
{
return True;
}
@@ -492,7 +492,7 @@ static int comparer(const void *a, const void *b)
#undef CAST
-static void listDirectoryOnColumn(WMFilePanel * panel, int column, char *path)
+static void listDirectoryOnColumn(WMFilePanel * panel, int column, const char
*path)
{
WMBrowser *bPtr = panel->browser;
struct dirent *dentry;
@@ -584,7 +584,7 @@ static void browserClick(WMBrowser * bPtr, WMFilePanel *
panel)
}
}
-static void showError(WMScreen * scr, WMWindow * owner, char *s, char *file)
+static void showError(WMScreen * scr, WMWindow * owner, const char *s, const
char *file)
{
char *errStr;
diff --git a/WINGs/wfontpanel.c b/WINGs/wfontpanel.c
index 55b5a1d..51e895d 100644
--- a/WINGs/wfontpanel.c
+++ b/WINGs/wfontpanel.c
@@ -71,9 +71,9 @@ static int scalableFontSizes[] = {
64
};
-static void setFontPanelFontName(FontPanel * panel, char *family, char *style,
double size);
+static void setFontPanelFontName(FontPanel * panel, const char *family, const
char *style, double size);
-static int isXLFD(char *font, int *length_ret);
+static int isXLFD(const char *font, int *length_ret);
static void arrangeLowerFrame(FontPanel * panel);
@@ -313,7 +313,7 @@ WMFont *WMGetFontPanelFont(WMFontPanel * panel)
return WMGetTextFieldFont(panel->sampleT);
}
-void WMSetFontPanelFont(WMFontPanel * panel, char *fontName)
+void WMSetFontPanelFont(WMFontPanel * panel, const char *fontName)
{
int fname_len;
FcPattern *pattern;
@@ -322,7 +322,7 @@ void WMSetFontPanelFont(WMFontPanel * panel, char *fontName)
if (!isXLFD(fontName, &fname_len)) {
/* maybe its proper fontconfig and we can parse it */
- pattern = FcNameParse((FcChar8 *) fontName);
+ pattern = FcNameParse((const FcChar8 *) fontName);
} else {
/* maybe its proper xlfd and we can convert it to an FcPattern
*/
pattern = XftXlfdParse(fontName, False, False);
@@ -386,7 +386,7 @@ static void arrangeLowerFrame(FontPanel * panel)
#define NUM_FIELDS 14
-static int isXLFD(char *font, int *length_ret)
+static int isXLFD(const char *font, int *length_ret)
{
int c = 0;
@@ -444,7 +444,7 @@ static void addSizeToTypeface(Typeface * face, int size)
}
}
-static void addTypefaceToXftFamily(Family * fam, char *style)
+static void addTypefaceToXftFamily(Family * fam, const char *style)
{
Typeface *face;
WMArrayIterator i;
@@ -474,7 +474,7 @@ static void addTypefaceToXftFamily(Family * fam, char
*style)
* registries (same family but different registries)
*
*/
-static void addFontToXftFamily(WMHashTable * families, char *name, char *style)
+static void addFontToXftFamily(WMHashTable * families, const char *name, const
char *style)
{
WMArrayIterator i;
WMArray *array;
@@ -723,7 +723,7 @@ static void sizeClick(WMWidget * w, void *data)
preview(panel);
}
-static void setFontPanelFontName(FontPanel * panel, char *family, char *style,
double size)
+static void setFontPanelFontName(FontPanel * panel, const char *family, const
char *style, double size)
{
int famrow;
int stlrow;
--
1.7.10.4
--
To unsubscribe, send mail to [email protected].
