X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=string.c;h=f80331900de09fccf573c18666c3fa007f8ca6bf;hb=fefff8660daa86834673fdcc284ebe5d02c1d37b;hp=65d2240891afc81f40e6b964d5c0f6b7b25a0ddc;hpb=742be1f7334570492615fdf89ce46123e3f71886;p=paraslash.git

diff --git a/string.c b/string.c
index 65d22408..f8033190 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;
+	}
 }
 
 /**
@@ -240,56 +245,6 @@ __must_check __malloc char *para_strcat(char *a, const char *b)
 	return tmp;
 }
 
-/**
- * Paraslash's version of dirname().
- *
- * \param name Pointer to the full path.
- *
- * Compute the directory component of \p name.
- *
- * \return If \a name is \p NULL or the empty string, return \p NULL.
- * Otherwise, Make a copy of \a name and return its directory component. Caller
- * is responsible to free the result.
- */
-__must_check __malloc char *para_dirname(const char *name)
-{
-	char *p, *ret;
-
-	if (!name || !*name)
-		return NULL;
-	ret = para_strdup(name);
-	p = strrchr(ret, '/');
-	if (!p)
-		*ret = '\0';
-	else
-		*p = '\0';
-	return ret;
-}
-
-/**
- * Paraslash's version of basename().
- *
- * \param name Pointer to the full path.
- *
- * Compute the filename component of \a name.
- *
- * \return \p NULL if (a) \a name is the empty string or \p NULL, or (b) name
- * ends with a slash.  Otherwise, a pointer within \a name is returned.  Caller
- * must not free the result.
- */
-__must_check char *para_basename(const char *name)
-{
-	char *ret;
-
-	if (!name || !*name)
-		return NULL;
-	ret = strrchr(name, '/');
-	if (!ret)
-		return (char *)name;
-	ret++;
-	return ret;
-}
-
 /**
  * Get the logname of the current user.
  *