X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=string.c;h=2c69c40ab3ce79f5147ba34bded5948af3c225f1;hb=27879fbdef3653aa7ba66eda97dc7cd731f2ce26;hp=65d2240891afc81f40e6b964d5c0f6b7b25a0ddc;hpb=a1c4cc4b26f72c19e12100d47a9da3c449aab3e7;p=paraslash.git

diff --git a/string.c b/string.c
index 65d22408..2c69c40a 100644
--- a/string.c
+++ b/string.c
@@ -199,17 +199,22 @@ __must_check __printf_1_2 __malloc char *make_message(const char *fmt, ...)
 }
 
 /**
- * Free the content of a pointer and set it to \p NULL.
+ * Free the content of a pointer and set it to NULL.
  *
- * This is equivalent to "free(*arg); *arg = NULL;".
+ * \param arg A pointer to the pointer whose content should be freed.
  *
- * \param arg The pointer whose content should be freed.
+ * If arg is NULL, the function returns immediately. Otherwise it frees the
+ * memory pointed to by *arg and sets *arg to NULL. Hence callers have to pass
+ * the *address* of the pointer variable that points to the memory which should
+ * be freed.
  */
 void freep(void *arg)
 {
-	void **ptr = (void **)arg;
-	free(*ptr);
-	*ptr = NULL;
+	if (arg) {
+		void **ptr = arg;
+		free(*ptr);
+		*ptr = NULL;
+	}
 }
 
 /**
@@ -597,37 +602,6 @@ int para_atoi32(const char *str, int32_t *value)
 	return 1;
 }
 
-static inline int loglevel_equal(const char *arg, const char * const ll)
-{
-	return !strncasecmp(arg, ll, strlen(ll));
-}
-
-/**
- * Compute the loglevel number from its name.
- *
- * \param txt The name of the loglevel (debug, info, ...).
- *
- * \return The numeric representation of the loglevel name.
- */
-int get_loglevel_by_name(const char *txt)
-{
-	if (loglevel_equal(txt, "debug"))
-		return LL_DEBUG;
-	if (loglevel_equal(txt, "info"))
-		return LL_INFO;
-	if (loglevel_equal(txt, "notice"))
-		return LL_NOTICE;
-	if (loglevel_equal(txt, "warning"))
-		return LL_WARNING;
-	if (loglevel_equal(txt, "error"))
-		return LL_ERROR;
-	if (loglevel_equal(txt, "crit"))
-		return LL_CRIT;
-	if (loglevel_equal(txt, "emerg"))
-		return LL_EMERG;
-	return -E_BAD_LL;
-}
-
 static int get_next_word(const char *buf, const char *delim, char **word)
 {
 	enum line_state_flags {LSF_HAVE_WORD = 1, LSF_BACKSLASH = 2,