ec/ecp_nistz256.c: harmonize with latest indent script.

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

diff --git a/crypto/buffer/buf_str.c b/crypto/buffer/buf_str.c
index 58028ebac72f4f1ecc7578896afe9079101ca603..75c4ec2bd1cca4506b07206692c27d5eaf9b9aed 100644 (file)
--- a/crypto/buffer/buf_str.c
+++ b/crypto/buffer/buf_str.c
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include <stdio.h>
 #include "cryptlib.h"
@@ -66,7 +66,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;
@@ -81,13 +81,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)