dovecot: Removed str_path() and str_ppath(). Dynamic strings are...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot/rev/f32ee254913d
changeset: 6426:f32ee254913d
user:      Timo Sirainen <tss at iki.fi>
date:      Sun Sep 16 13:42:08 2007 +0300
description:
Removed str_path() and str_ppath(). Dynamic strings are better.

diffstat:

2 files changed, 52 deletions(-)
src/lib/strfuncs.c |   45 ---------------------------------------------
src/lib/strfuncs.h |    7 -------

diffs (72 lines):

diff -r 382828caeb61 -r f32ee254913d src/lib/strfuncs.c
--- a/src/lib/strfuncs.c	Sun Sep 16 13:41:32 2007 +0300
+++ b/src/lib/strfuncs.c	Sun Sep 16 13:42:08 2007 +0300
@@ -310,51 +310,6 @@ int i_strocpy(char *dest, const char *sr
 
 	*dest++ = '\0';
 	return *src == '\0' ? 0 : -1;
-}
-
-int str_path(char *dest, size_t dstsize, const char *dir, const char *file)
-{
-	size_t dirlen, filelen;
-
-	dirlen = strlen(dir);
-	filelen = strlen(file);
-
-	if (dirlen+1+filelen >= dstsize) {
-		if (dstsize > 0)
-			*dest = '\0';
-		errno = ENAMETOOLONG;
-		return -1;
-	}
-
-	memcpy(dest, dir, dirlen);
-	dest[dirlen] = '/';
-	memcpy(dest + dirlen + 1, file, filelen);
-	dest[dirlen + 1 + filelen] = '\0';
-	return 0;
-}
-
-int str_ppath(char *dest, size_t dstsize, const char *dir,
-	      const char *file_prefix, const char *file)
-{
-	size_t dirlen, prefixlen, filelen;
-
-	dirlen = strlen(dir);
-	prefixlen = strlen(file_prefix);
-	filelen = strlen(file);
-
-	if (dirlen+1+prefixlen+filelen >= dstsize) {
-		if (dstsize > 0)
-			*dest = '\0';
-		errno = ENAMETOOLONG;
-		return -1;
-	}
-
-	memcpy(dest, dir, dirlen);
-	dest[dirlen] = '/';
-	memcpy(dest + dirlen + 1, file_prefix, prefixlen);
-	memcpy(dest + dirlen + prefixlen + 1, file, filelen);
-	dest[dirlen + 1 + prefixlen + filelen] = '\0';
-	return 0;
 }
 
 char *str_ucase(char *str)
diff -r 382828caeb61 -r f32ee254913d src/lib/strfuncs.h
--- a/src/lib/strfuncs.h	Sun Sep 16 13:41:32 2007 +0300
+++ b/src/lib/strfuncs.h	Sun Sep 16 13:42:08 2007 +0300
@@ -46,13 +46,6 @@ bool is_numeric(const char *str, char en
 /* Like strlcpy(), but return -1 if buffer was overflown, 0 if not. */
 int i_strocpy(char *dest, const char *src, size_t dstsize);
 
-/* Print given directory and file to dest buffer, separated with '/'.
-   If destination buffer is too small, it's set to empty string and errno is
-   set to ENAMETOOLONG. Retuns -1 if buffer is too small, or 0 if not. */
-int str_path(char *dest, size_t dstsize, const char *dir, const char *file);
-int str_ppath(char *dest, size_t dstsize, const char *dir,
-	      const char *file_prefix, const char *file);
-
 char *str_ucase(char *str);
 char *str_lcase(char *str);
 const char *t_str_lcase(const char *str);