From 675f215af291135ee3ece5414e4a5a2e89bf4ed3 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 30 Jan 2014 08:52:32 +1000 Subject: [PATCH] Revert "os: xstrtokenize takes and returns const char * now" This reverts commit d0339a5c66846c9f14e3b584e34688520a0916ab. seriously, what the fuck? Are we making xstrdup() return a const char now too? Signed-off-by: Peter Hutterer Reviewed-by: Hans de Goede --- include/misc.h | 2 +- os/utils.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/misc.h b/include/misc.h index 165d42e85..17de71041 100644 --- a/include/misc.h +++ b/include/misc.h @@ -246,7 +246,7 @@ padding_for_int32(const int bytes) } -extern const char **xstrtokenize(const char *str, const char *separators); +extern char **xstrtokenize(const char *str, const char *separators); extern void FormatInt64(int64_t num, char *string); extern void FormatUInt64(uint64_t num, char *string); extern void FormatUInt64Hex(uint64_t num, char *string); diff --git a/os/utils.c b/os/utils.c index dc18a67b1..497779b52 100644 --- a/os/utils.c +++ b/os/utils.c @@ -1973,10 +1973,10 @@ CheckUserAuthorization(void) * Tokenize a string into a NULL terminated array of strings. Always returns * an allocated array unless an error occurs. */ -const char ** +char ** xstrtokenize(const char *str, const char *separators) { - const char **list, **nlist; + char **list, **nlist; char *tok, *tmp; unsigned num = 0, n; @@ -2004,7 +2004,7 @@ xstrtokenize(const char *str, const char *separators) error: free(tmp); for (n = 0; n < num; n++) - free((void *) list[n]); + free(list[n]); free(list); return NULL; }