Kaydet (Commit) 5b43126e authored tarafından Martin v. Löwis's avatar Martin v. Löwis

Regenerate.

üst 94962615
...@@ -1098,70 +1098,70 @@ alias(identifier name, identifier asname, PyArena *arena) ...@@ -1098,70 +1098,70 @@ alias(identifier name, identifier asname, PyArena *arena)
#define CHECKSIZE(BUF, OFF, MIN) { \ #define CHECKSIZE(BUF, OFF, MIN) { \
int need = *(OFF) + MIN; \ int need = *(OFF) + MIN; \
if (need >= PyString_GET_SIZE(*(BUF))) { \ if (need >= PyString_GET_SIZE(*(BUF))) { \
int newsize = PyString_GET_SIZE(*(BUF)) * 2; \ int newsize = PyString_GET_SIZE(*(BUF)) * 2; \
if (newsize < need) \ if (newsize < need) \
newsize = need; \ newsize = need; \
if (_PyString_Resize((BUF), newsize) < 0) \ if (_PyString_Resize((BUF), newsize) < 0) \
return 0; \ return 0; \
} \ } \
} }
static int static int
marshal_write_int(PyObject **buf, int *offset, int x) marshal_write_int(PyObject **buf, int *offset, int x)
{ {
char *s; char *s;
CHECKSIZE(buf, offset, 4) CHECKSIZE(buf, offset, 4)
s = PyString_AS_STRING(*buf) + (*offset); s = PyString_AS_STRING(*buf) + (*offset);
s[0] = (x & 0xff); s[0] = (x & 0xff);
s[1] = (x >> 8) & 0xff; s[1] = (x >> 8) & 0xff;
s[2] = (x >> 16) & 0xff; s[2] = (x >> 16) & 0xff;
s[3] = (x >> 24) & 0xff; s[3] = (x >> 24) & 0xff;
*offset += 4; *offset += 4;
return 1; return 1;
} }
static int static int
marshal_write_bool(PyObject **buf, int *offset, bool b) marshal_write_bool(PyObject **buf, int *offset, bool b)
{ {
if (b) if (b)
marshal_write_int(buf, offset, 1); marshal_write_int(buf, offset, 1);
else else
marshal_write_int(buf, offset, 0); marshal_write_int(buf, offset, 0);
return 1; return 1;
} }
static int static int
marshal_write_identifier(PyObject **buf, int *offset, identifier id) marshal_write_identifier(PyObject **buf, int *offset, identifier id)
{ {
int l = PyString_GET_SIZE(id); int l = PyString_GET_SIZE(id);
marshal_write_int(buf, offset, l); marshal_write_int(buf, offset, l);
CHECKSIZE(buf, offset, l); CHECKSIZE(buf, offset, l);
memcpy(PyString_AS_STRING(*buf) + *offset, memcpy(PyString_AS_STRING(*buf) + *offset,
PyString_AS_STRING(id), l); PyString_AS_STRING(id), l);
*offset += l; *offset += l;
return 1; return 1;
} }
static int static int
marshal_write_string(PyObject **buf, int *offset, string s) marshal_write_string(PyObject **buf, int *offset, string s)
{ {
int len = PyString_GET_SIZE(s); int len = PyString_GET_SIZE(s);
marshal_write_int(buf, offset, len); marshal_write_int(buf, offset, len);
CHECKSIZE(buf, offset, len); CHECKSIZE(buf, offset, len);
memcpy(PyString_AS_STRING(*buf) + *offset, memcpy(PyString_AS_STRING(*buf) + *offset,
PyString_AS_STRING(s), len); PyString_AS_STRING(s), len);
*offset += len; *offset += len;
return 1; return 1;
} }
static int static int
marshal_write_object(PyObject **buf, int *offset, object s) marshal_write_object(PyObject **buf, int *offset, object s)
{ {
/* XXX */ /* XXX */
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment