frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

os: xstrtokenize takes and returns const char * now 

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Keith Packard 2013-11-16 23:34:59 -08:00
parent c608560dbb
commit d0339a5c66
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/misc.h
View File

@ -246,7 +246,7 @@ padding_for_int32(const int bytes)
} }
extern char **xstrtokenize(const char *str, const char *separators); extern const char **xstrtokenize(const char *str, const char *separators);
extern void FormatInt64(int64_t num, char *string); extern void FormatInt64(int64_t num, char *string);
extern void FormatUInt64(uint64_t num, char *string); extern void FormatUInt64(uint64_t num, char *string);
extern void FormatUInt64Hex(uint64_t num, char *string); extern void FormatUInt64Hex(uint64_t num, char *string);

6
os/utils.c
View File

@ -1946,10 +1946,10 @@ CheckUserAuthorization(void)
* Tokenize a string into a NULL terminated array of strings. Always returns * Tokenize a string into a NULL terminated array of strings. Always returns
* an allocated array unless an error occurs. * an allocated array unless an error occurs.
*/ */
char ** const char **
xstrtokenize(const char *str, const char *separators) xstrtokenize(const char *str, const char *separators)
{ {
char **list, **nlist; const char **list, **nlist;
char *tok, *tmp; char *tok, *tmp;
unsigned num = 0, n; unsigned num = 0, n;
@ -1977,7 +1977,7 @@ xstrtokenize(const char *str, const char *separators)
error: error:
free(tmp); free(tmp);
for (n = 0; n < num; n++) for (n = 0; n < num; n++)
free(list[n]); free((void *) list[n]);
free(list); free(list);
return NULL; return NULL;
} }