diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2014-01-21 13:50:13 -0600 |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2014-01-21 13:50:13 -0600 |
| commit | ff1769802fc3ac342e45d4967eeece028184fe6c (patch) | |
| tree | fd08ccf458c45f70ccb09547d28826a7071c73b3 /Python/pystrtod.c | |
| parent | 77772c41204d33ca7ccb96908d2275a1d2711aa6 (diff) | |
| parent | e0833fb5e338ab5d63f7ec2d15bdb65b3dc99e6d (diff) | |
| download | cpython-ff1769802fc3ac342e45d4967eeece028184fe6c.tar.gz | |
Issue #20301: Merge with 3.3
Diffstat (limited to 'Python/pystrtod.c')
| -rw-r--r-- | Python/pystrtod.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Python/pystrtod.c b/Python/pystrtod.c index 4ab8f08d22..b8dd919a26 100644 --- a/Python/pystrtod.c +++ b/Python/pystrtod.c @@ -164,7 +164,7 @@ static double _PyOS_ascii_strtod(const char *nptr, char **endptr) { char *fail_pos; - double val = -1.0; + double val; struct lconv *locale_data; const char *decimal_point; size_t decimal_point_len; @@ -923,7 +923,7 @@ static char *uc_float_strings[] = { static char * format_float_short(double d, char format_code, - int mode, Py_ssize_t precision, + int mode, int precision, int always_add_sign, int add_dot_0_if_integer, int use_alt_formatting, char **float_strings, int *type) { @@ -1059,7 +1059,7 @@ format_float_short(double d, char format_code, /* if using an exponent, reset decimal point position to 1 and adjust exponent accordingly.*/ if (use_exp) { - exp = decpt - 1; + exp = (int)decpt - 1; decpt = 1; } /* ensure vdigits_start < decpt <= vdigits_end, or vdigits_start < |