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

WUtil: Added 'const' attribute to parameters for file related API

Browse Source 
As a side note, in 'wfindfileinlist' the first argument should be:
  const char * const *path_list

However, due to limited support for const in plain C, that would
introduce warnings in user code. For compatibility issues, this
was not implemented.
This commit is contained in:
Christophe CURIS
2013-05-04 15:43:22 +02:00
committed by Carlos R. Mafra
parent bbf84eb0e8
commit ea9d3e643f
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
WINGs/WINGs/WUtil.h
View File

@@ -193,15 +193,15 @@ void __wmessage(const char *func, const char *file, int line, int type, const ch
/* ---[ WINGs/findfile.c ]------------------------------------------------ */ /* ---[ WINGs/findfile.c ]------------------------------------------------ */
char* wfindfile(char *paths, char *file); char* wfindfile(const char *paths, const char *file);
char* wfindfileinlist(char **path_list, char *file); char* wfindfileinlist(char *const *path_list, const char *file);
char* wfindfileinarray(WMPropList* array, char *file); char* wfindfileinarray(WMPropList* array, const char *file);
char* wexpandpath(char *path); char* wexpandpath(const char *path);
int wcopy_file(char *toPath, char *srcFile, char *destFile); int wcopy_file(const char *toPath, const char *srcFile, const char *destFile);
/* don't free the returned string */ /* don't free the returned string */
char* wgethomedir(void); char* wgethomedir(void);

18
WINGs/findfile.c
View File

@@ -88,9 +88,9 @@ static char *getuserhomedir(const char *username)
return home; return home;
} }
char *wexpandpath(char *path) char *wexpandpath(const char *path)
{ {
char *origpath = path; const char *origpath = path;
char buffer2[PATH_MAX + 2]; char buffer2[PATH_MAX + 2];
char buffer[PATH_MAX + 2]; char buffer[PATH_MAX + 2];
int i; int i;
@@ -200,7 +200,7 @@ error:
} }
/* return address of next char != tok or end of string whichever comes first */ /* return address of next char != tok or end of string whichever comes first */
static char *skipchar(char *string, char tok) static const char *skipchar(const char *string, char tok)
{ {
while (*string != 0 && *string == tok) while (*string != 0 && *string == tok)
string++; string++;
@@ -209,7 +209,7 @@ static char *skipchar(char *string, char tok)
} }
/* return address of next char == tok or end of string whichever comes first */ /* return address of next char == tok or end of string whichever comes first */
static char *nextchar(char *string, char tok) static const char *nextchar(const char *string, char tok)
{ {
while (*string != 0 && *string != tok) while (*string != 0 && *string != tok)
string++; string++;
@@ -232,10 +232,10 @@ static char *nextchar(char *string, char tok)
* *
*---------------------------------------------------------------------- *----------------------------------------------------------------------
*/ */
char *wfindfile(char *paths, char *file) char *wfindfile(const char *paths, const char *file)
{ {
char *path; char *path;
char *tmp, *tmp2; const char *tmp, *tmp2;
int len, flen; int len, flen;
char *fullpath; char *fullpath;
@@ -296,7 +296,7 @@ char *wfindfile(char *paths, char *file)
return NULL; return NULL;
} }
char *wfindfileinlist(char **path_list, char *file) char *wfindfileinlist(char *const *path_list, const char *file)
{ {
int i; int i;
char *path; char *path;
@@ -349,7 +349,7 @@ char *wfindfileinlist(char **path_list, char *file)
return NULL; return NULL;
} }
char *wfindfileinarray(WMPropList * array, char *file) char *wfindfileinarray(WMPropList *array, const char *file)
{ {
int i; int i;
char *path; char *path;
@@ -409,7 +409,7 @@ char *wfindfileinarray(WMPropList * array, char *file)
return NULL; return NULL;
} }
int wcopy_file(char *dir, char *src_file, char *dest_file) int wcopy_file(const char *dir, const char *src_file, const char *dest_file)
{ {
FILE *src, *dst; FILE *src, *dst;
size_t nread, nwritten; size_t nread, nwritten;