Skip to content

Commit f3ea951

Browse files
committed
Revert "Revert "Improve style of C code""
This reverts commit b40982a.
1 parent 3dd16b3 commit f3ea951

File tree

1 file changed

+45
-42
lines changed

1 file changed

+45
-42
lines changed

Modules/_sqlite/module.c

Lines changed: 45 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -405,48 +405,51 @@ pysqlite_error_name(int rc)
405405
}
406406

407407
static int
408-
add_sequence_constants(PyObject *module) {
409-
PyObject *kwd;
410-
const char *_keywords[] = {
411-
"ABORT", "ACTION", "ADD", "AFTER", "ALL", "ALTER", "ALWAYS", "ANALYZE",
412-
"AND", "AS", "ASC", "ATTACH", "AUTOINCREMENT", "BEFORE", "BEGIN",
413-
"BETWEEN", "BY", "CASCADE", "CASE", "CAST", "CHECK", "COLLATE", "COLUMN",
414-
"COMMIT", "CONFLICT", "CONSTRAINT", "CREATE", "CROSS", "CURRENT",
415-
"CURRENT_DATE", "CURRENT_TIME", "CURRENT_TIMESTAMP", "DATABASE", "DEFAULT",
416-
"DEFERRABLE", "DEFERRED", "DELETE", "DESC", "DETACH", "DISTINCT", "DO",
417-
"DROP", "EACH", "ELSE", "END", "ESCAPE", "EXCEPT", "EXCLUDE", "EXCLUSIVE",
418-
"EXISTS", "EXPLAIN", "FAIL", "FILTER", "FIRST", "FOLLOWING", "FOR",
419-
"FOREIGN", "FROM", "FULL", "GENERATED", "GLOB", "GROUP", "GROUPS",
420-
"HAVING", "IF", "IGNORE", "IMMEDIATE", "IN", "INDEX", "INDEXED",
421-
"INITIALLY", "INNER", "INSERT", "INSTEAD", "INTERSECT", "INTO", "IS",
422-
"ISNULL", "JOIN", "KEY", "LAST", "LEFT", "LIKE", "LIMIT", "MATCH",
423-
"MATERIALIZED", "NATURAL", "NO", "NOT", "NOTHING", "NOTNULL", "NULL",
424-
"NULLS", "OF", "OFFSET", "ON", "OR", "ORDER", "OTHERS", "OUTER", "OVER",
425-
"PARTITION", "PLAN", "PRAGMA", "PRECEDING", "PRIMARY", "QUERY", "RAISE",
426-
"RANGE", "RECURSIVE", "REFERENCES", "REGEXP", "REINDEX", "RELEASE",
427-
"RENAME", "REPLACE", "RESTRICT", "RETURNING", "RIGHT", "ROLLBACK", "ROW",
428-
"ROWS", "SAVEPOINT", "SELECT", "SET", "TABLE", "TEMP", "TEMPORARY", "THEN",
429-
"TIES", "TO", "TRANSACTION", "TRIGGER", "UNBOUNDED", "UNION", "UNIQUE",
430-
"UPDATE", "USING", "VACUUM", "VALUES", "VIEW", "VIRTUAL", "WHEN", "WHERE",
431-
"WINDOW", "WITH", "WITHOUT", NULL
432-
};
433-
PyObject *keywords = PyTuple_New(147);
434-
if (keywords == NULL) {
435-
return -1;
436-
}
437-
for (int i = 0; _keywords[i] != NULL; i++) {
438-
kwd = PyUnicode_FromString(_keywords[i]);
439-
if (PyTuple_SetItem(keywords, i, kwd) != 0) {
440-
Py_DECREF(kwd);
441-
Py_DECREF(keywords);
442-
return -1;
443-
}
444-
}
445-
if (PyModule_Add(module, "SQLITE_KEYWORDS", keywords) < 0) {
446-
Py_DECREF(keywords);
447-
return -1;
448-
}
449-
return 0;
408+
add_sequence_constants(PyObject *module)
409+
{
410+
PyObject *kwd;
411+
const char *_keywords[] = {
412+
"ABORT", "ACTION", "ADD", "AFTER", "ALL", "ALTER", "ALWAYS", "ANALYZE",
413+
"AND", "AS", "ASC", "ATTACH", "AUTOINCREMENT", "BEFORE", "BEGIN",
414+
"BETWEEN", "BY", "CASCADE", "CASE", "CAST", "CHECK", "COLLATE",
415+
"COLUMN", "COMMIT", "CONFLICT", "CONSTRAINT", "CREATE", "CROSS",
416+
"CURRENT", "CURRENT_DATE", "CURRENT_TIME", "CURRENT_TIMESTAMP",
417+
"DATABASE", "DEFAULT", "DEFERRABLE", "DEFERRED", "DELETE", "DESC",
418+
"DETACH", "DISTINCT", "DO", "DROP", "EACH", "ELSE", "END", "ESCAPE",
419+
"EXCEPT", "EXCLUDE", "EXCLUSIVE", "EXISTS", "EXPLAIN", "FAIL",
420+
"FILTER", "FIRST", "FOLLOWING", "FOR", "FOREIGN", "FROM", "FULL",
421+
"GENERATED", "GLOB", "GROUP", "GROUPS", "HAVING", "IF", "IGNORE",
422+
"IMMEDIATE", "IN", "INDEX", "INDEXED", "INITIALLY", "INNER", "INSERT",
423+
"INSTEAD", "INTERSECT", "INTO", "IS", "ISNULL", "JOIN", "KEY", "LAST",
424+
"LEFT", "LIKE", "LIMIT", "MATCH", "MATERIALIZED", "NATURAL", "NO",
425+
"NOT", "NOTHING", "NOTNULL", "NULL", "NULLS", "OF", "OFFSET", "ON",
426+
"OR", "ORDER", "OTHERS", "OUTER", "OVER", "PARTITION", "PLAN",
427+
"PRAGMA", "PRECEDING", "PRIMARY", "QUERY", "RAISE", "RANGE",
428+
"RECURSIVE", "REFERENCES", "REGEXP", "REINDEX", "RELEASE", "RENAME",
429+
"REPLACE", "RESTRICT", "RETURNING", "RIGHT", "ROLLBACK", "ROW", "ROWS",
430+
"SAVEPOINT", "SELECT", "SET", "TABLE", "TEMP", "TEMPORARY", "THEN",
431+
"TIES", "TO", "TRANSACTION", "TRIGGER", "UNBOUNDED", "UNION", "UNIQUE",
432+
"UPDATE", "USING", "VACUUM", "VALUES", "VIEW", "VIRTUAL", "WHEN",
433+
"WHERE", "WINDOW", "WITH", "WITHOUT", NULL
434+
};
435+
PyObject *keywords = PyTuple_New(147);
436+
437+
if (keywords == NULL) {
438+
return -1;
439+
}
440+
for (int i = 0; _keywords[i] != NULL; i++) {
441+
kwd = PyUnicode_FromString(_keywords[i]);
442+
if (PyTuple_SetItem(keywords, i, kwd) != 0) {
443+
Py_DECREF(kwd);
444+
Py_DECREF(keywords);
445+
return -1;
446+
}
447+
}
448+
if (PyModule_Add(module, "SQLITE_KEYWORDS", keywords) < 0) {
449+
Py_DECREF(keywords);
450+
return -1;
451+
}
452+
return 0;
450453
}
451454

452455
static int

0 commit comments

Comments
 (0)