Merge branch 't/cleanups'

[dss.git] / string.c

diff --git a/string.c b/string.c
index afac0027fce2e8b4f63a35007a33b0d3e74bc7ce..d340811e6f42b23ce7cec7b4e6a03653ac9522e2 100644 (file)
--- a/string.c
+++ b/string.c
@@ -1,5 +1,11 @@
+/*
+ * Copyright (C) 2004-2010 Andre Noll <maan@systemlinux.org>
+ *
+ * Licensed under the GPL v2. For licencing details see COPYING.
+ */
 #include <string.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <stdarg.h>
 #include <assert.h>
 #include <limits.h>
@@ -9,7 +15,6 @@
 #include <unistd.h>
 
 
-#include "cmdline.h"
 #include "gcc-compat.h"
 #include "log.h"
 #include "error.h"
@@ -88,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",
@@ -234,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;