X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=string.c;h=0e04d3740b499b3db6721690d3c30419758b8371;hb=08471ab23c0abdf0ddd7ff836a15bd81fbce7520;hp=198e9f1d286ee2228638a2a7994fe9e65f41ccac;hpb=b3c68fd8519a426d6b6285dcb5a865670285e99a;p=paraslash.git

diff --git a/string.c b/string.c
index 198e9f1d..0e04d374 100644
--- a/string.c
+++ b/string.c
@@ -245,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.
  *
@@ -602,37 +552,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,