diff options
author | Antoine Pitrou <solipsis@pitrou.net> | 2013-10-12 21:16:32 (GMT) |
---|---|---|
committer | Antoine Pitrou <solipsis@pitrou.net> | 2013-10-12 21:16:32 (GMT) |
commit | 3892419a7a8321bef27262b0d8f0a22305830ce5 (patch) | |
tree | ff863a14defc8df5917577ecc1588818feb75d67 | |
parent | 32a14662287d30ef58f31b9d20c5226c52b136e8 (diff) | |
parent | b30f271299b10bb927253a3e42f1348e3ab27e39 (diff) | |
download | cpython-3892419a7a8321bef27262b0d8f0a22305830ce5.zip cpython-3892419a7a8321bef27262b0d8f0a22305830ce5.tar.gz cpython-3892419a7a8321bef27262b0d8f0a22305830ce5.tar.bz2 |
Merge
-rw-r--r-- | Python/marshal.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Python/marshal.c b/Python/marshal.c index 12565f3..9ca23db 100644 --- a/Python/marshal.c +++ b/Python/marshal.c @@ -83,7 +83,7 @@ typedef struct { else w_more(c, p) static void -w_more(int c, WFILE *p) +w_more(char c, WFILE *p) { Py_ssize_t size, newsize; if (p->str == NULL) @@ -100,7 +100,7 @@ w_more(int c, WFILE *p) p->ptr = PyBytes_AS_STRING((PyBytesObject *)p->str) + size; p->end = PyBytes_AS_STRING((PyBytesObject *)p->str) + newsize; - *p->ptr++ = Py_SAFE_DOWNCAST(c, int, char); + *p->ptr++ = c; } } @@ -159,7 +159,7 @@ w_pstring(const char *s, Py_ssize_t n, WFILE *p) static void w_short_pstring(const char *s, Py_ssize_t n, WFILE *p) { - w_byte(n, p); + w_byte(Py_SAFE_DOWNCAST(n, Py_ssize_t, unsigned char), p); w_string(s, n, p); } |