X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=string.c;h=cefb45d674075cf1fcb2e42b42e5b0a929a52c16;hp=c228c24c4f27eee753349e361afd1d70708aa2b4;hb=08be831b7b7e3e55d862eb988a604ccbde603403;hpb=ffb2eaa90429f6d5c3d369509efcdf91c5463dad

diff --git a/string.c b/string.c
index c228c24c..cefb45d6 100644
--- a/string.c
+++ b/string.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2004-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -521,14 +521,15 @@ __printf_2_3 int para_printf(struct para_buffer *b, const char *fmt, ...)
 	}
 }
 
-/** \cond LLONG_MAX and LLONG_MIN might not be defined. */
+/** \cond llong_minmax */
+/* LLONG_MAX and LLONG_MIN might not be defined. */
 #ifndef LLONG_MAX
 #define LLONG_MAX 9223372036854775807LL
 #endif
 #ifndef LLONG_MIN
 #define LLONG_MIN (-LLONG_MAX - 1LL)
 #endif
-/** \endcond */
+/** \endcond llong_minmax */
 
 /**
  * Convert a string to a 64-bit signed integer value.
@@ -615,7 +616,7 @@ int get_loglevel_by_name(const char *txt)
 	return -1;
 }
 
-static int get_next_word(const char *buf, const char *delim,  char **word)
+static int get_next_word(const char *buf, const char *delim, char **word)
 {
 	enum line_state_flags {LSF_HAVE_WORD = 1, LSF_BACKSLASH = 2,
 		LSF_SINGLE_QUOTE = 4, LSF_DOUBLE_QUOTE = 8};
@@ -719,6 +720,8 @@ void free_argv(char **argv)
 {
 	int i;
 
+	if (!argv)
+		return;
 	for (i = 0; argv[i]; i++)
 		free(argv[i]);
 	free(argv);
@@ -760,6 +763,7 @@ err:
 	while (num_words > 0)
 		free(argv[--num_words]);
 	free(argv);
+	*result = NULL;
 	return ret;
 }