summaryrefslogtreecommitdiff
path: root/Python/pystrtod.c
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2013-12-19 16:28:04 +0200
committerSerhiy Storchaka <storchaka@gmail.com>2013-12-19 16:28:04 +0200
commit4227b17d9339bf04d5bc1af4a589eabaaa46703c (patch)
tree956667b1fe56f0c11ec7af6c85345a88e4be796e /Python/pystrtod.c
parent65ab1a2a0f28cdc19d18a84dcccbe18fdf15d858 (diff)
parentb283473939e00f8ee3b773edf64b4c0098ff2e38 (diff)
downloadcpython-4227b17d9339bf04d5bc1af4a589eabaaa46703c.tar.gz
Issue #18829: csv.Dialect() now checks type for delimiter, escapechar and
quotechar fields. Original patch by Vajrasky Kok.
Diffstat (limited to 'Python/pystrtod.c')
-rw-r--r--Python/pystrtod.c6
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 <