diff options
| author | Neal Norwitz <nnorwitz@gmail.com> | 2006-03-20 01:53:23 (GMT) |
|---|---|---|
| committer | Neal Norwitz <nnorwitz@gmail.com> | 2006-03-20 01:53:23 (GMT) |
| commit | 2aa9a5dfdd2966c57036dc836ba8e91ad47ecf14 (patch) | |
| tree | 49688fd8e420b9a1625345de6593e147523b7b66 /Objects | |
| parent | 70f05c5d7f0259d056dbb19bc5632c8357fd6998 (diff) | |
| download | cpython-2aa9a5dfdd2966c57036dc836ba8e91ad47ecf14.zip cpython-2aa9a5dfdd2966c57036dc836ba8e91ad47ecf14.tar.gz cpython-2aa9a5dfdd2966c57036dc836ba8e91ad47ecf14.tar.bz2 | |
Use macro versions instead of function versions when we already know the type.
This will hopefully get rid of some Coverity warnings, be a hint to
developers, and be marginally faster.
Some asserts were added when the type is currently known, but depends
on values from another function.
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/classobject.c | 10 | ||||
| -rw-r--r-- | Objects/frameobject.c | 4 | ||||
| -rw-r--r-- | Objects/stringobject.c | 9 |
3 files changed, 12 insertions, 11 deletions
diff --git a/Objects/classobject.c b/Objects/classobject.c index 037252d..f3e636a 100644 --- a/Objects/classobject.c +++ b/Objects/classobject.c @@ -388,15 +388,15 @@ class_str(PyClassObject *op) Py_INCREF(name); return name; } - m = PyString_Size(mod); - n = PyString_Size(name); + m = PyString_GET_SIZE(mod); + n = PyString_GET_SIZE(name); res = PyString_FromStringAndSize((char *)NULL, m+1+n); if (res != NULL) { - char *s = PyString_AsString(res); - memcpy(s, PyString_AsString(mod), m); + char *s = PyString_AS_STRING(res); + memcpy(s, PyString_AS_STRING(mod), m); s += m; *s++ = '.'; - memcpy(s, PyString_AsString(name), n); + memcpy(s, PyString_AS_STRING(name), n); } return res; } diff --git a/Objects/frameobject.c b/Objects/frameobject.c index 6e3f297..8aa3377 100644 --- a/Objects/frameobject.c +++ b/Objects/frameobject.c @@ -749,7 +749,7 @@ PyFrame_FastToLocals(PyFrameObject *f) return; PyErr_Fetch(&error_type, &error_value, &error_traceback); fast = f->f_localsplus; - j = PyTuple_Size(map); + j = PyTuple_GET_SIZE(map); if (j > f->f_nlocals) j = f->f_nlocals; if (f->f_nlocals) @@ -787,7 +787,7 @@ PyFrame_LocalsToFast(PyFrameObject *f, int clear) return; PyErr_Fetch(&error_type, &error_value, &error_traceback); fast = f->f_localsplus; - j = PyTuple_Size(map); + j = PyTuple_GET_SIZE(map); if (j > f->f_nlocals) j = f->f_nlocals; if (f->f_nlocals) diff --git a/Objects/stringobject.c b/Objects/stringobject.c index d23c973..e3a0197 100644 --- a/Objects/stringobject.c +++ b/Objects/stringobject.c @@ -569,8 +569,9 @@ PyObject *PyString_DecodeEscape(const char *s, if (!w) goto failed; /* Append bytes to output buffer. */ - r = PyString_AsString(w); - rn = PyString_Size(w); + assert(PyString_Check(w)); + r = PyString_AS_STRING(w); + rn = PyString_GET_SIZE(w); memcpy(p, r, rn); p += rn; Py_DECREF(w); @@ -2314,12 +2315,12 @@ string_translate(PyStringObject *self, PyObject *args) } table = table1; - inlen = PyString_Size(input_obj); + inlen = PyString_GET_SIZE(input_obj); result = PyString_FromStringAndSize((char *)NULL, inlen); if (result == NULL) return NULL; output_start = output = PyString_AsString(result); - input = PyString_AsString(input_obj); + input = PyString_AS_STRING(input_obj); if (dellen == 0) { /* If no deletions are required, use faster code */ |