Further synchronisation with Unix

[oweals/openssl.git] / crypto / buffer / buffer.c

diff --git a/crypto/buffer/buffer.c b/crypto/buffer/buffer.c
index d96487e7dbd06a2955516b91a1029bf7fbd6dfe7..b3e947771d5850246f571457bdce1f4d328650c0 100644 (file)
--- a/crypto/buffer/buffer.c
+++ b/crypto/buffer/buffer.c
@@ -149,7 +149,7 @@ int BUF_MEM_grow_clean(BUF_MEM *str, int len)
                ret=OPENSSL_realloc_clean(str->data,str->max,n);
        if (ret == NULL)
                {
-               BUFerr(BUF_F_BUF_MEM_GROW,ERR_R_MALLOC_FAILURE);
+               BUFerr(BUF_F_BUF_MEM_GROW_CLEAN,ERR_R_MALLOC_FAILURE);
                len=0;
                }
        else
@@ -161,42 +161,3 @@ int BUF_MEM_grow_clean(BUF_MEM *str, int len)
                }
        return(len);
        }
-
-char *BUF_strdup(const char *str)
-       {
-       char *ret;
-       int n;
-
-       if (str == NULL) return(NULL);
-
-       n=strlen(str);
-       ret=OPENSSL_malloc(n+1);
-       if (ret == NULL) 
-               {
-               BUFerr(BUF_F_BUF_STRDUP,ERR_R_MALLOC_FAILURE);
-               return(NULL);
-               }
-       memcpy(ret,str,n+1);
-       return(ret);
-       }
-
-size_t BUF_strlcpy(char *dst, const char *src, size_t size)
-       {
-       size_t l = 0;
-       for(; size > 1 && *src; size--)
-               {
-               *dst++ = *src++;
-               l++;
-               }
-       if (size)
-               *dst = '\0';
-       return l + strlen(src);
-       }
-
-size_t BUF_strlcat(char *dst, const char *src, size_t size)
-       {
-       size_t l = 0;
-       for(; size > 0 && *dst; size--, dst++)
-               l++;
-       return l + BUF_strlcpy(dst, src, size);
-       }