Skip to content

Commit e4d3657

Browse files
committed
Several function names shortened
There's not so much need for a strict convention for static functions. Leaving some 'psyco_' prefix when the internal function and the python-exposed function clashed.
1 parent a5c0a22 commit e4d3657

18 files changed

+231
-234
lines changed

psycopg/adapter_datetime.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737

3838
RAISES_NEG int
39-
psyco_adapter_datetime_init(void)
39+
adapter_datetime_init(void)
4040
{
4141
PyDateTime_IMPORT;
4242

psycopg/adapter_datetime.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ typedef struct {
4545
} pydatetimeObject;
4646

4747

48-
RAISES_NEG HIDDEN int psyco_adapter_datetime_init(void);
48+
RAISES_NEG HIDDEN int adapter_datetime_init(void);
4949

5050
HIDDEN PyObject *psyco_Date(PyObject *module, PyObject *args);
5151
#define psyco_Date_doc \

psycopg/connection_type.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,10 @@ psyco_conn_cursor(connectionObject *self, PyObject *args, PyObject *kwargs)
112112
goto exit;
113113
}
114114

115-
if (0 > psyco_curs_withhold_set((cursorObject *)obj, withhold)) {
115+
if (0 > curs_withhold_set((cursorObject *)obj, withhold)) {
116116
goto exit;
117117
}
118-
if (0 > psyco_curs_scrollable_set((cursorObject *)obj, scrollable)) {
118+
if (0 > curs_scrollable_set((cursorObject *)obj, scrollable)) {
119119
goto exit;
120120
}
121121

psycopg/cursor.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ struct cursorObject {
9393
/* C-callable functions in cursor_int.c and cursor_type.c */
9494
BORROWED HIDDEN PyObject *curs_get_cast(cursorObject *self, PyObject *oid);
9595
HIDDEN void curs_reset(cursorObject *self);
96-
RAISES_NEG HIDDEN int psyco_curs_withhold_set(cursorObject *self, PyObject *pyvalue);
97-
RAISES_NEG HIDDEN int psyco_curs_scrollable_set(cursorObject *self, PyObject *pyvalue);
98-
HIDDEN PyObject *psyco_curs_validate_sql_basic(cursorObject *self, PyObject *sql);
96+
RAISES_NEG HIDDEN int curs_withhold_set(cursorObject *self, PyObject *pyvalue);
97+
RAISES_NEG HIDDEN int curs_scrollable_set(cursorObject *self, PyObject *pyvalue);
98+
HIDDEN PyObject *curs_validate_sql_basic(cursorObject *self, PyObject *sql);
9999
HIDDEN void curs_set_result(cursorObject *self, PGresult *pgres);
100100

101101
/* exception-raising macros */

psycopg/cursor_int.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ _curs_is_composible(PyObject *obj)
108108
* after having set an exception.
109109
*/
110110
PyObject *
111-
psyco_curs_validate_sql_basic(cursorObject *self, PyObject *sql)
111+
curs_validate_sql_basic(cursorObject *self, PyObject *sql)
112112
{
113113
PyObject *rv = NULL;
114114
PyObject *comp = NULL;

0 commit comments

Comments
 (0)