gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-27 08:52:30 +01:00
Code Issues Projects Releases Wiki Activity

WUtil: Added 'const' attribute on non-modified arguments to functions

Browse Source 
A number of functions do not actually modify the strings given as
parameter, but only read or duplicate it. In this case it is a good
practice to mark that parameter as pointer-to-const to let the
compiler known about it, to be able to perform appropriate
optimisations.
This commit is contained in:
Christophe CURIS
2013-05-04 15:43:21 +02:00
committed by Carlos R. Mafra
parent ac89706859
commit bbf84eb0e8
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
WINGs/WINGs/WUtil.h
View File

@@ -220,7 +220,7 @@ char* wstrndup(const char *str, size_t len);
* str1 and str2 can be any strings including static and constant strings. * str1 and str2 can be any strings including static and constant strings.
* str1 and str2 will not be modified. * str1 and str2 will not be modified.
* Free the returned string when you're done with it. */ * Free the returned string when you're done with it. */
char* wstrconcat(char *str1, char *str2); char* wstrconcat(const char *str1, const char *str2);
/* This will append src to dst, and return dst. dst MUST be either NULL /* This will append src to dst, and return dst. dst MUST be either NULL
* or a string that was a result of a dynamic allocation (malloc, realloc * or a string that was a result of a dynamic allocation (malloc, realloc
@@ -229,7 +229,7 @@ char* wstrconcat(char *str1, char *str2);
* it is equivalent to calling wstrdup(src) ). * it is equivalent to calling wstrdup(src) ).
* The returned address may be different from the original address of dst, * The returned address may be different from the original address of dst,
* so always assign the returned address to avoid dangling pointers. */ * so always assign the returned address to avoid dangling pointers. */
char* wstrappend(char *dst, char *src); char* wstrappend(char *dst, const char *src);
size_t wstrlcpy(char *, const char *, size_t); size_t wstrlcpy(char *, const char *, size_t);
size_t wstrlcat(char *, const char *, size_t); size_t wstrlcat(char *, const char *, size_t);
@@ -815,7 +815,7 @@ Bool WMWritePropListToFile(WMPropList *plist, char *path);
char* wusergnusteppath(void); char* wusergnusteppath(void);
char* wdefaultspathfordomain(char *domain); char* wdefaultspathfordomain(const char *domain);
char* wglobaldefaultspathfordomain(const char *domain); char* wglobaldefaultspathfordomain(const char *domain);

18
WINGs/proplist.c
View File

@@ -502,22 +502,22 @@ static INLINE int getNonSpaceChar(PLData * pldata)
return c; return c;
} }
static char *unescapestr(char *src) static char *unescapestr(const char *src)
{ {
char *dest = wmalloc(strlen(src) + 1); char *dest = wmalloc(strlen(src) + 1);
char *sPtr, *dPtr; char *dPtr;
char ch; char ch;
for (sPtr = src, dPtr = dest; *sPtr; sPtr++, dPtr++) { for (dPtr = dest; *src; src++, dPtr++) {
if (*sPtr != '\\') { if (*src != '\\') {
*dPtr = *sPtr; *dPtr = *src;
} else { } else {
ch = *(++sPtr); ch = *(++src);
if ((ch >= '0') && (ch <= '3')) { if ((ch >= '0') && (ch <= '3')) {
/* assume next 2 chars are octal too */ /* assume next 2 chars are octal too */
*dPtr = ((ch & 07) << 6); *dPtr = ((ch & 07) << 6);
*dPtr |= ((*(++sPtr) & 07) << 3); *dPtr |= ((*(++src) & 07) << 3);
*dPtr |= *(++sPtr) & 07; *dPtr |= *(++src) & 07;
} else { } else {
switch (ch) { switch (ch) {
case 'a': case 'a':
@@ -542,7 +542,7 @@ static char *unescapestr(char *src)
*dPtr = '\f'; *dPtr = '\f';
break; break;
default: default:
*dPtr = *sPtr; *dPtr = *src;
} }
} }
} }

4
WINGs/string.c
View File

@@ -203,7 +203,7 @@ char *wstrndup(const char *str, size_t len)
return copy; return copy;
} }
char *wstrconcat(char *str1, char *str2) char *wstrconcat(const char *str1, const char *str2)
{ {
char *str; char *str;
size_t slen; size_t slen;
@@ -226,7 +226,7 @@ char *wstrconcat(char *str1, char *str2)
return str; return str;
} }
char *wstrappend(char *dst, char *src) char *wstrappend(char *dst, const char *src)
{ {
size_t slen; size_t slen;

2
WINGs/userdefaults.c
View File

@@ -80,7 +80,7 @@ char *wusergnusteppath()
return path; return path;
} }
char *wdefaultspathfordomain(char *domain) char *wdefaultspathfordomain(const char *domain)
{ {
char *path; char *path;
char *gspath; char *gspath;