traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added *PyMarshal_WriteObjectToString() (moved the relevant code there 

from marshal_loads()).
This commit is contained in:
Guido van Rossum 1996-08-19 22:07:17 +00:00
parent 49c70a7a4d
commit 3f3bb3d3c9
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Python/marshal.c
View File

@ -535,6 +535,30 @@ rds_object(str, len)
return r_object(&rf);
}
object *
PyMarshal_WriteObjectToString(x) /* wrs_object() */
object *x;
{
WFILE wf;
wf.fp = NULL;
wf.str = newsizedstringobject((char *)NULL, 50);
if (wf.str == NULL)
return NULL;
wf.ptr = GETSTRINGVALUE((stringobject *)wf.str);
wf.end = wf.ptr + getstringsize(wf.str);
wf.error = 0;
w_object(x, &wf);
if (wf.str != NULL)
resizestring(&wf.str,
(int) (wf.ptr - GETSTRINGVALUE((stringobject *)wf.str)));
if (wf.error) {
XDECREF(wf.str);
err_setstr(ValueError, "unmarshallable object");
return NULL;
}
return wf.str;
}
/* And an interface for Python programs... */
static object *
@ -595,27 +619,10 @@ marshal_dumps(self, args)
object *self;
object *args;
{
WFILE wf;
object *x;
if (!getargs(args, "O", &x))
return NULL;
wf.fp = NULL;
wf.str = newsizedstringobject((char *)NULL, 50);
if (wf.str == NULL)
return NULL;
wf.ptr = GETSTRINGVALUE((stringobject *)wf.str);
wf.end = wf.ptr + getstringsize(wf.str);
wf.error = 0;
w_object(x, &wf);
if (wf.str != NULL)
resizestring(&wf.str,
(int) (wf.ptr - GETSTRINGVALUE((stringobject *)wf.str)));
if (wf.error) {
XDECREF(wf.str);
err_setstr(ValueError, "unmarshallable object");
return NULL;
}
return wf.str;
return PyMarshal_WriteObjectToString(x);
}
static object *