Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Just inline a function, and discover that it can only raise an exception. 

Next step: should PyString_AsStringAndSize accept buffer objects?
This commit is contained in:
Amaury Forgeot d'Arc 2007-11-22 21:42:04 +00:00
parent 3ee05afa53
commit e165727d57
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Objects/stringobject.c
View File

@ -504,16 +504,6 @@ string_getsize(register PyObject *op)
return len; return len;
} }
static /*const*/ char *
string_getbuffer(register PyObject *op)
{
char *s;
Py_ssize_t len;
if (PyString_AsStringAndSize(op, &s, &len))
return NULL;
return s;
}
Py_ssize_t Py_ssize_t
PyString_Size(register PyObject *op) PyString_Size(register PyObject *op)
{ {
@ -525,8 +515,11 @@ PyString_Size(register PyObject *op)
/*const*/ char * /*const*/ char *
PyString_AsString(register PyObject *op) PyString_AsString(register PyObject *op)
{ {
if (!PyString_Check(op)) if (!PyString_Check(op)) {
return string_getbuffer(op); PyErr_Format(PyExc_TypeError,
"expected bytes, %.200s found", Py_Type(op)->tp_name);
return NULL;
}
return ((PyStringObject *)op) -> ob_sval; return ((PyStringObject *)op) -> ob_sval;
} }
@ -542,7 +535,7 @@ PyString_AsStringAndSize(register PyObject *obj,
if (!PyString_Check(obj)) { if (!PyString_Check(obj)) {
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"expected string, %.200s found", Py_Type(obj)->tp_name); "expected bytes, %.200s found", Py_Type(obj)->tp_name);
return -1; return -1;
} }
@ -551,7 +544,7 @@ PyString_AsStringAndSize(register PyObject *obj,
*len = PyString_GET_SIZE(obj); *len = PyString_GET_SIZE(obj);
else if (strlen(*s) != (size_t)PyString_GET_SIZE(obj)) { else if (strlen(*s) != (size_t)PyString_GET_SIZE(obj)) {
PyErr_SetString(PyExc_TypeError, PyErr_SetString(PyExc_TypeError,
"expected string without null bytes"); "expected bytes with no null");
return -1; return -1;
} }
return 0; return 0;