X-Git-Url: http://git.tuebingen.mpg.de/?p=dss.git;a=blobdiff_plain;f=string.c;h=d340811e6f42b23ce7cec7b4e6a03653ac9522e2;hp=be92d3e58f7abd8724311cd43c321e75d83fae4e;hb=c4653d0f3496d0b8b21da774c1f8312c20e3f25f;hpb=00e72666c12061e55c020a706448fac5497ce940 diff --git a/string.c b/string.c index be92d3e..d340811 100644 --- a/string.c +++ b/string.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2008 Andre Noll + * Copyright (C) 2004-2010 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -93,8 +93,9 @@ __must_check __malloc void *dss_realloc(void *p, size_t size) */ __must_check __malloc void *dss_malloc(size_t size) { + void *p; assert(size); - void *p = malloc(size); + p = malloc(size); if (!p) { DSS_EMERG_LOG("malloc failed (size = %zu), aborting\n", @@ -239,7 +240,7 @@ __must_check __malloc char *dss_logname(void) * * \return The number of substrings found in \a args. */ -__must_check unsigned split_args(char *args, char *** const argv_ptr, const char *delim) +unsigned split_args(char *args, char *** const argv_ptr, const char *delim) { char *p = args; char **argv;