From 84bb1cf9940c64a6300bfdd31091b20f5f14ebb4 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Fri, 17 May 2013 00:12:04 +0200 Subject: [PATCH] Fix compilater warnings on Windows 64-bit --- Python/getargs.c | 6 +++--- Python/traceback.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Python/getargs.c b/Python/getargs.c index 08faeb464d6..87b6a6e3b20 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 b928902ef02..c56b23f6cca 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