1 files changed, 12 insertions, 13 deletions

diff --git a/src/lib/libcrypto/bio/b_print.c b/src/lib/libcrypto/bio/b_print.c
index 3a87b0ec0b..f2bd91d5a0 100644
--- a/src/lib/libcrypto/bio/b_print.c
+++ b/src/lib/libcrypto/bio/b_print.c
@@ -79,7 +79,7 @@
 #include <openssl/bn.h>         /* To get BN_LLONG properly defined */
 #include <openssl/bio.h>
 
-#if defined(BN_LLONG) || defined(SIXTY_FOUR_BIT)
+#ifdef BN_LLONG
 # ifndef HAVE_LONG_LONG
 #  define HAVE_LONG_LONG 1
 # endif
@@ -117,7 +117,7 @@
 
 #if HAVE_LONG_LONG
 # if defined(OPENSSL_SYS_WIN32) && !defined(__GNUC__)
-# define LLONG __int64
+# define LLONG _int64
 # else
 # define LLONG long long
 # endif
@@ -482,7 +482,7 @@ fmtint(
     int flags)
 {
     int signvalue = 0;
-    const char *prefix = "";
+    char *prefix = "";
     unsigned LLONG uvalue;
     char convert[DECIMAL_SIZE(value)+3];
     int place = 0;
@@ -513,8 +513,8 @@ fmtint(
             (caps ? "0123456789ABCDEF" : "0123456789abcdef")
             [uvalue % (unsigned) base];
         uvalue = (uvalue / (unsigned) base);
-    } while (uvalue && (place < (int)sizeof(convert)));
-    if (place == sizeof(convert))
+    } while (uvalue && (place < sizeof convert));
+    if (place == sizeof convert)
         place--;
     convert[place] = 0;
 
@@ -619,7 +619,6 @@ fmtfp(
     int caps = 0;
     long intpart;
     long fracpart;
-    long max10;
 
     if (max < 0)
         max = 6;
@@ -640,12 +639,11 @@ fmtfp(
 
     /* we "cheat" by converting the fractional part to integer by
        multiplying by a factor of 10 */
-    max10 = roundv(pow_10(max));
-    fracpart = roundv(pow_10(max) * (ufvalue - intpart));
+    fracpart = roundv((pow_10(max)) * (ufvalue - intpart));
 
-    if (fracpart >= max10) {
+    if (fracpart >= (long)pow_10(max)) {
         intpart++;
-        fracpart -= max10;
+        fracpart -= (long)pow_10(max);
     }
 
     /* convert integer part */
@@ -654,7 +652,7 @@ fmtfp(
             (caps ? "0123456789ABCDEF"
               : "0123456789abcdef")[intpart % 10];
         intpart = (intpart / 10);
-    } while (intpart && (iplace < (int)sizeof(iconvert)));
+    } while (intpart && (iplace < sizeof iconvert));
     if (iplace == sizeof iconvert)
         iplace--;
     iconvert[iplace] = 0;
@@ -808,6 +806,7 @@ int BIO_vprintf (BIO *bio, const char *format, va_list args)
         }
 
 /* As snprintf is not available everywhere, we provide our own implementation.
+ * In case of overflow or error, this returns -1.
  * This function has nothing to do with BIOs, but it's closely related
  * to BIO_printf, and we need *some* name prefix ...
  * (XXX  the function should be renamed, but to what?) */
@@ -832,10 +831,10 @@ int BIO_vsnprintf(char *buf, size_t n, const char *format, va_list args)
         _dopr(&buf, NULL, &n, &retlen, &truncated, format, args);
 
         if (truncated)
-                /* In case of truncation, return -1 like traditional snprintf.
+                /* In case of truncation, return -1 unlike traditional snprintf.
                  * (Current drafts for ISO/IEC 9899 say snprintf should return
                  * the number of characters that would have been written,
-                 * had the buffer been large enough.) */
+                 * had the buffer been large enough, as it did historically.) */
                 return -1;
         else
                 return (retlen <= INT_MAX) ? (int)retlen : -1;