Mercurial > dovecot > original-hg > dovecot-1.2
changeset 6426:f32ee254913d HEAD
Removed str_path() and str_ppath(). Dynamic strings are better.
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Sun, 16 Sep 2007 13:42:08 +0300 |
parents | 382828caeb61 |
children | c242677f2aa9 |
files | src/lib/strfuncs.c src/lib/strfuncs.h |
diffstat | 2 files changed, 0 insertions(+), 52 deletions(-) [+] |
line wrap: on
line diff
--- 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 @@ -312,51 +312,6 @@ 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) { char *p;
--- 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 @@ /* 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);