Ensure that x**0 mod 1 = 0.

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

diff --git a/crypto/buffer/buf_str.c b/crypto/buffer/buf_str.c
index 07840b57c402cbc193e91156ff671c6caf87de38..12ef1fa0649694d68bd7565f3112a9c6cdc77967 100644 (file)
--- a/crypto/buffer/buf_str.c
+++ b/crypto/buffer/buf_str.c
@@ -64,7 +64,7 @@ size_t BUF_strnlen(const char *str, size_t maxlen)
        {
        const char *p;
 
-       for (p = str; *p != '\0' && maxlen-- != 0; ++p)
+       for (p = str; maxlen-- != 0 && *p != '\0'; ++p)
                ;
 
        return p - str;
@@ -79,13 +79,10 @@ char *BUF_strdup(const char *str)
 char *BUF_strndup(const char *str, size_t siz)
        {
        char *ret;
-       size_t len;
 
        if (str == NULL) return(NULL);
 
-       len = BUF_strnlen(str, siz);
-       if (siz > len)
-           siz = len;
+       siz = BUF_strnlen(str, siz);
 
        ret=OPENSSL_malloc(siz+1);
        if (ret == NULL)