psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2025-02-12 07:10:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Wrap _Bytes_Resize into a function with clearer semantic

Browse Source 
Limit the static checker hacking to a simpler function.
This commit is contained in:
Daniele Varrazzo 2018-12-28 03:36:34 +01:00
parent f9b798aca9
commit 117f7d33f8
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
psycopg/bytes_format.c
View File

@ -99,6 +99,19 @@ getnextarg(PyObject *args, Py_ssize_t arglen, Py_ssize_t *p_argidx)
return NULL; return NULL;
} }
/* wrapper around _Bytes_Resize offering normal Python call semantics */
STEALS(1)
Py_LOCAL_INLINE(PyObject *)
resize_bytes(PyObject *b, Py_ssize_t newsize) {
if (0 == _Bytes_Resize(&b, newsize)) {
return b;
}
else {
return NULL;
}
}
/* fmt%(v1,v2,...) is roughly equivalent to sprintf(fmt, v1, v2, ...) */ /* fmt%(v1,v2,...) is roughly equivalent to sprintf(fmt, v1, v2, ...) */
PyObject * PyObject *
@ -137,10 +150,10 @@ Bytes_Format(PyObject *format, PyObject *args)
if (--rescnt < 0) { if (--rescnt < 0) {
rescnt = fmtcnt + 100; rescnt = fmtcnt + 100;
reslen += rescnt; reslen += rescnt;
if (_Bytes_Resize(&result, reslen)) if (!(result = resize_bytes(result, reslen))) {
return NULL; return NULL;
res = Bytes_AS_STRING(result) }
+ reslen - rescnt; res = Bytes_AS_STRING(result) + reslen - rescnt;
--rescnt; --rescnt;
} }
*res++ = *fmt++; *res++ = *fmt++;
@ -248,7 +261,7 @@ Bytes_Format(PyObject *format, PyObject *args)
Py_DECREF(args); Py_DECREF(args);
return PyErr_NoMemory(); return PyErr_NoMemory();
} }
if (_Bytes_Resize(&result, reslen)) { if (!(result = resize_bytes(result, reslen))) {
Py_XDECREF(temp); Py_XDECREF(temp);
if (args_owned) if (args_owned)
Py_DECREF(args); Py_DECREF(args);
@ -281,8 +294,9 @@ Bytes_Format(PyObject *format, PyObject *args)
if (args_owned) { if (args_owned) {
Py_DECREF(args); Py_DECREF(args);
} }
if (_Bytes_Resize(&result, reslen - rescnt)) if (!(result = resize_bytes(result, reslen - rescnt))) {
return NULL; return NULL;
}
return result; return result;
error: error: