Try to fix weird assertion error on the Fedora buildbot.

pitrou · pitrou · commit b30f271299b1 · 2013-10-12T23:14:47.000+02:00
diff --git 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);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ typedef struct {`
`83`	`83`	`else w_more(c, p)`
`84`	`84`
`85`	`85`	`static void`
`86`		`-w_more(int c, WFILE *p)`
	`86`	`+w_more(char c, WFILE *p)`
`87`	`87`	`{`
`88`	`88`	`Py_ssize_t size, newsize;`
`89`	`89`	`if (p->str == NULL)`
`@@ -100,7 +100,7 @@ w_more(int c, WFILE *p)`
`100`	`100`	`p->ptr = PyBytes_AS_STRING((PyBytesObject *)p->str) + size;`
`101`	`101`	`p->end =`
`102`	`102`	`PyBytes_AS_STRING((PyBytesObject *)p->str) + newsize;`
`103`		`- *p->ptr++ = Py_SAFE_DOWNCAST(c, int, char);`
	`103`	`+ *p->ptr++ = c;`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`
`@@ -159,7 +159,7 @@ w_pstring(const char s, Py_ssize_t n, WFILE p)`
`159`	`159`	`static void`
`160`	`160`	`w_short_pstring(const char s, Py_ssize_t n, WFILE p)`
`161`	`161`	`{`
`162`		`- w_byte(n, p);`
	`162`	`+ w_byte(Py_SAFE_DOWNCAST(n, Py_ssize_t, unsigned char), p);`
`163`	`163`	`w_string(s, n, p);`
`164`	`164`	`}`
`165`	`165`