projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add function CMS_RecipientInfo_encrypt
[oweals/openssl.git]
/
crypto
/
bio
/
b_print.c
diff --git
a/crypto/bio/b_print.c
b/crypto/bio/b_print.c
index f80335e269f5a8cc804ee6667310913ffb6e449d..143a7cfefa37e201bc5bd11d53fac7cd23dff17f 100644
(file)
--- a/
crypto/bio/b_print.c
+++ b/
crypto/bio/b_print.c
@@
-79,7
+79,7
@@
#include <openssl/bn.h> /* To get BN_LLONG properly defined */
#include <openssl/bio.h>
#include <openssl/bn.h> /* To get BN_LLONG properly defined */
#include <openssl/bio.h>
-#if
def BN_LLONG
+#if
defined(BN_LLONG) || defined(SIXTY_FOUR_BIT)
# ifndef HAVE_LONG_LONG
# define HAVE_LONG_LONG 1
# endif
# ifndef HAVE_LONG_LONG
# define HAVE_LONG_LONG 1
# endif
@@
-115,9
+115,9
@@
#define LDOUBLE double
#endif
#define LDOUBLE double
#endif
-#if HAVE_LONG_LONG
-# if defined(
OPENSSL_SYS
_WIN32) && !defined(__GNUC__)
-# define LLONG _int64
+#if
def
HAVE_LONG_LONG
+# if defined(_WIN32) && !defined(__GNUC__)
+# define LLONG _
_
int64
# else
# define LLONG long long
# endif
# else
# define LLONG long long
# endif
@@
-482,7
+482,7
@@
fmtint(
int flags)
{
int signvalue = 0;
int flags)
{
int signvalue = 0;
- char *prefix = "";
+ c
onst c
har *prefix = "";
unsigned LLONG uvalue;
char convert[DECIMAL_SIZE(value)+3];
int place = 0;
unsigned LLONG uvalue;
char convert[DECIMAL_SIZE(value)+3];
int place = 0;
@@
-576,12
+576,12
@@
abs_val(LDOUBLE value)
}
static LDOUBLE
}
static LDOUBLE
-pow
10(int
exp)
+pow
_10(int in_
exp)
{
LDOUBLE result = 1;
{
LDOUBLE result = 1;
- while (exp) {
+ while (
in_
exp) {
result *= 10;
result *= 10;
- exp--;
+
in_
exp--;
}
return result;
}
}
return result;
}
@@
-619,6
+619,7
@@
fmtfp(
int caps = 0;
long intpart;
long fracpart;
int caps = 0;
long intpart;
long fracpart;
+ long max10;
if (max < 0)
max = 6;
if (max < 0)
max = 6;
@@
-639,11
+640,12
@@
fmtfp(
/* we "cheat" by converting the fractional part to integer by
multiplying by a factor of 10 */
/* we "cheat" by converting the fractional part to integer by
multiplying by a factor of 10 */
- fracpart = roundv((pow10(max)) * (ufvalue - intpart));
+ max10 = roundv(pow_10(max));
+ fracpart = roundv(pow_10(max) * (ufvalue - intpart));
- if (fracpart >=
pow10(max)
) {
+ if (fracpart >=
max10
) {
intpart++;
intpart++;
- fracpart -=
pow10(max)
;
+ fracpart -=
max10
;
}
/* convert integer part */
}
/* convert integer part */
@@
-652,8
+654,8
@@
fmtfp(
(caps ? "0123456789ABCDEF"
: "0123456789abcdef")[intpart % 10];
intpart = (intpart / 10);
(caps ? "0123456789ABCDEF"
: "0123456789abcdef")[intpart % 10];
intpart = (intpart / 10);
- } while (intpart && (iplace < (int)sizeof(i
place
)));
- if (iplace == sizeof i
place
)
+ } while (intpart && (iplace < (int)sizeof(i
convert
)));
+ if (iplace == sizeof i
convert
)
iplace--;
iconvert[iplace] = 0;
iplace--;
iconvert[iplace] = 0;
@@
-664,7
+666,7
@@
fmtfp(
: "0123456789abcdef")[fracpart % 10];
fracpart = (fracpart / 10);
} while (fplace < max);
: "0123456789abcdef")[fracpart % 10];
fracpart = (fracpart / 10);
} while (fplace < max);
- if (fplace == sizeof f
place
)
+ if (fplace == sizeof f
convert
)
fplace--;
fconvert[fplace] = 0;
fplace--;
fconvert[fplace] = 0;