diff options
author | Éric Araujo <merwok@netwok.org> | 2011-07-29 12:30:03 (GMT) |
---|---|---|
committer | Éric Araujo <merwok@netwok.org> | 2011-07-29 12:30:03 (GMT) |
commit | 0bbacc621c0d844e24ea8e9ff84e35883af6678b (patch) | |
tree | 4db1983004caa59b7d56765118d9973ca6d41f79 /Python | |
parent | abe9dc3f30b9166e2c4c9c5e21a235ec655a6ca0 (diff) | |
parent | bab50cb1247f79d10a746ec4dae88848319ff162 (diff) | |
download | cpython-0bbacc621c0d844e24ea8e9ff84e35883af6678b.zip cpython-0bbacc621c0d844e24ea8e9ff84e35883af6678b.tar.gz cpython-0bbacc621c0d844e24ea8e9ff84e35883af6678b.tar.bz2 |
Branch merge
Diffstat (limited to 'Python')
-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 35fcd3a..edf0366 100644 --- a/Python/marshal.c +++ b/Python/marshal.c @@ -57,7 +57,7 @@ typedef struct { int error; /* see WFERR_* values */ int depth; /* If fp == NULL, the following are valid: */ - PyObject * readable; /* Stream-like object being read from */ + PyObject *readable; /* Stream-like object being read from */ PyObject *str; PyObject *current_filename; char *ptr; @@ -467,7 +467,7 @@ typedef WFILE RFILE; /* Same struct with different invariants */ static int r_string(char *s, int n, RFILE *p) { - char * ptr; + char *ptr; int read, left; if (!p->readable) { @@ -566,7 +566,7 @@ r_long(RFILE *p) static PyObject * r_long64(RFILE *p) { - PyObject * result = NULL; + PyObject *result = NULL; long lo4 = r_long(p); long hi4 = r_long(p); |