summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2013-05-16 22:12:04 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2013-05-16 22:12:04 (GMT)
commit84bb1cf9940c64a6300bfdd31091b20f5f14ebb4 (patch)
tree6ef52d821a157e4f3008b68bbfc8d7b85d69284c
parent9ce59bbe43178fa033234412318c64abc817cb40 (diff)
downloadcpython-84bb1cf9940c64a6300bfdd31091b20f5f14ebb4.zip
cpython-84bb1cf9940c64a6300bfdd31091b20f5f14ebb4.tar.gz
cpython-84bb1cf9940c64a6300bfdd31091b20f5f14ebb4.tar.bz2
Fix compilater warnings on Windows 64-bit
-rw-r--r--Python/getargs.c6
-rw-r--r--Python/traceback.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/Python/getargs.c b/Python/getargs.c
index 08faeb4..87b6a6e 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -55,7 +55,7 @@ typedef struct {
/* Forward */
static int vgetargs1(PyObject *, const char *, va_list *, int);
-static void seterror(int, const char *, int *, const char *, const char *);
+static void seterror(Py_ssize_t, const char *, int *, const char *, const char *);
static char *convertitem(PyObject *, const char **, va_list *, int, int *,
char *, size_t, freelist_t *);
static char *converttuple(PyObject *, const char **, va_list *, int,
@@ -357,7 +357,7 @@ vgetargs1(PyObject *args, const char *format, va_list *p_va, int flags)
static void
-seterror(int iarg, const char *msg, int *levels, const char *fname,
+seterror(Py_ssize_t iarg, const char *msg, int *levels, const char *fname,
const char *message)
{
char buf[512];
@@ -373,7 +373,7 @@ seterror(int iarg, const char *msg, int *levels, const char *fname,
}
if (iarg != 0) {
PyOS_snprintf(p, sizeof(buf) - (p - buf),
- "argument %d", iarg);
+ "argument %zd", iarg);
i = 0;
p += strlen(p);
while (levels[i] > 0 && i < 32 && (int)(p-buf) < 220) {
diff --git a/Python/traceback.c b/Python/traceback.c
index b928902..c56b23f 100644
--- a/Python/traceback.c
+++ b/Python/traceback.c
@@ -13,7 +13,7 @@
#define OFF(x) offsetof(PyTracebackObject, x)
-#define PUTS(fd, str) write(fd, str, strlen(str))
+#define PUTS(fd, str) write(fd, str, (int)strlen(str))
#define MAX_STRING_LENGTH 500
#define MAX_FRAME_DEPTH 100
#define MAX_NTHREADS 100