Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-08 06:10:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

[3.10] bpo-45634: Don't combine error checks when adding sqlite3 int constants (GH-29251). (GH-29343)

Browse source
This commit is contained in:
Erlend Egeberg Aasland 2021-10-31 12:22:22 +01:00 • committed by GitHub
parent 3997f3ce8a
commit ed91f959b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 49 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

91
Modules/_sqlite/module.c
View file

@ -273,51 +273,58 @@ static PyMethodDef module_methods[] = {
{NULL, NULL} {NULL, NULL}
}; };
static int add_integer_constants(PyObject *module) { static int
int ret = 0; add_integer_constants(PyObject *module) {
#define ADD_INT(ival) \
do { \
if (PyModule_AddIntConstant(module, #ival, ival) < 0) { \
return -1; \
} \
} while (0); \
ret += PyModule_AddIntMacro(module, PARSE_DECLTYPES); ADD_INT(PARSE_DECLTYPES);
ret += PyModule_AddIntMacro(module, PARSE_COLNAMES); ADD_INT(PARSE_COLNAMES);
ret += PyModule_AddIntMacro(module, SQLITE_OK); ADD_INT(SQLITE_OK);
ret += PyModule_AddIntMacro(module, SQLITE_DENY); ADD_INT(SQLITE_DENY);
ret += PyModule_AddIntMacro(module, SQLITE_IGNORE); ADD_INT(SQLITE_IGNORE);
ret += PyModule_AddIntMacro(module, SQLITE_CREATE_INDEX); ADD_INT(SQLITE_CREATE_INDEX);
ret += PyModule_AddIntMacro(module, SQLITE_CREATE_TABLE); ADD_INT(SQLITE_CREATE_TABLE);
ret += PyModule_AddIntMacro(module, SQLITE_CREATE_TEMP_INDEX); ADD_INT(SQLITE_CREATE_TEMP_INDEX);
ret += PyModule_AddIntMacro(module, SQLITE_CREATE_TEMP_TABLE); ADD_INT(SQLITE_CREATE_TEMP_TABLE);
ret += PyModule_AddIntMacro(module, SQLITE_CREATE_TEMP_TRIGGER); ADD_INT(SQLITE_CREATE_TEMP_TRIGGER);
ret += PyModule_AddIntMacro(module, SQLITE_CREATE_TEMP_VIEW); ADD_INT(SQLITE_CREATE_TEMP_VIEW);
ret += PyModule_AddIntMacro(module, SQLITE_CREATE_TRIGGER); ADD_INT(SQLITE_CREATE_TRIGGER);
ret += PyModule_AddIntMacro(module, SQLITE_CREATE_VIEW); ADD_INT(SQLITE_CREATE_VIEW);
ret += PyModule_AddIntMacro(module, SQLITE_DELETE); ADD_INT(SQLITE_DELETE);
ret += PyModule_AddIntMacro(module, SQLITE_DROP_INDEX); ADD_INT(SQLITE_DROP_INDEX);
ret += PyModule_AddIntMacro(module, SQLITE_DROP_TABLE); ADD_INT(SQLITE_DROP_TABLE);
ret += PyModule_AddIntMacro(module, SQLITE_DROP_TEMP_INDEX); ADD_INT(SQLITE_DROP_TEMP_INDEX);
ret += PyModule_AddIntMacro(module, SQLITE_DROP_TEMP_TABLE); ADD_INT(SQLITE_DROP_TEMP_TABLE);
ret += PyModule_AddIntMacro(module, SQLITE_DROP_TEMP_TRIGGER); ADD_INT(SQLITE_DROP_TEMP_TRIGGER);
ret += PyModule_AddIntMacro(module, SQLITE_DROP_TEMP_VIEW); ADD_INT(SQLITE_DROP_TEMP_VIEW);
ret += PyModule_AddIntMacro(module, SQLITE_DROP_TRIGGER); ADD_INT(SQLITE_DROP_TRIGGER);
ret += PyModule_AddIntMacro(module, SQLITE_DROP_VIEW); ADD_INT(SQLITE_DROP_VIEW);
ret += PyModule_AddIntMacro(module, SQLITE_INSERT); ADD_INT(SQLITE_INSERT);
ret += PyModule_AddIntMacro(module, SQLITE_PRAGMA); ADD_INT(SQLITE_PRAGMA);
ret += PyModule_AddIntMacro(module, SQLITE_READ); ADD_INT(SQLITE_READ);
ret += PyModule_AddIntMacro(module, SQLITE_SELECT); ADD_INT(SQLITE_SELECT);
ret += PyModule_AddIntMacro(module, SQLITE_TRANSACTION); ADD_INT(SQLITE_TRANSACTION);
ret += PyModule_AddIntMacro(module, SQLITE_UPDATE); ADD_INT(SQLITE_UPDATE);
ret += PyModule_AddIntMacro(module, SQLITE_ATTACH); ADD_INT(SQLITE_ATTACH);
ret += PyModule_AddIntMacro(module, SQLITE_DETACH); ADD_INT(SQLITE_DETACH);
ret += PyModule_AddIntMacro(module, SQLITE_ALTER_TABLE); ADD_INT(SQLITE_ALTER_TABLE);
ret += PyModule_AddIntMacro(module, SQLITE_REINDEX); ADD_INT(SQLITE_REINDEX);
ret += PyModule_AddIntMacro(module, SQLITE_ANALYZE); ADD_INT(SQLITE_ANALYZE);
ret += PyModule_AddIntMacro(module, SQLITE_CREATE_VTABLE); ADD_INT(SQLITE_CREATE_VTABLE);
ret += PyModule_AddIntMacro(module, SQLITE_DROP_VTABLE); ADD_INT(SQLITE_DROP_VTABLE);
ret += PyModule_AddIntMacro(module, SQLITE_FUNCTION); ADD_INT(SQLITE_FUNCTION);
ret += PyModule_AddIntMacro(module, SQLITE_SAVEPOINT); ADD_INT(SQLITE_SAVEPOINT);
#if SQLITE_VERSION_NUMBER >= 3008003 #if SQLITE_VERSION_NUMBER >= 3008003
ret += PyModule_AddIntMacro(module, SQLITE_RECURSIVE); ADD_INT(SQLITE_RECURSIVE);
#endif #endif
ret += PyModule_AddIntMacro(module, SQLITE_DONE); ADD_INT(SQLITE_DONE);
return ret; #undef ADD_INT
return 0;
} }
static struct PyModuleDef _sqlite3module = { static struct PyModuleDef _sqlite3module = {