Skip to content

Commit 029bdfc

Browse files
CopilotCopilot
authored
Remove unused DECLARE_CONNECTION_GUARD macro and all its call sites
1 parent 08432ab commit 029bdfc

1 file changed

Lines changed: 0 additions & 50 deletions

File tree

‎src/MySQLdb/_mysql.c‎

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ typedef struct {
110110

111111
extern PyTypeObject _mysql_ResultObject_Type;
112112

113-
#define DECLARE_CONNECTION_GUARD
114113
static int
115114
_mysql_ConnectionObject_AllocateLock(_mysql_ConnectionObject *self)
116115
{
@@ -329,7 +328,6 @@ _mysql_ResultObject_Initialize(
329328
PyObject *conv=NULL;
330329
int n, i;
331330
MYSQL_FIELD *fields;
332-
DECLARE_CONNECTION_GUARD;
333331

334332
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!|iO", kwlist,
335333
&_mysql_ConnectionObject_Type, &conn, &use, &conv))
@@ -822,7 +820,6 @@ _mysql_ConnectionObject_close(
822820
_mysql_ConnectionObject *self,
823821
PyObject *noargs)
824822
{
825-
DECLARE_CONNECTION_GUARD;
826823
BEGIN_CONNECTION_OPERATION(self, return _mysql_Exception(self));
827824
Py_BEGIN_ALLOW_THREADS
828825
mysql_close(&(self->connection));
@@ -844,7 +841,6 @@ _mysql_ConnectionObject_affected_rows(
844841
PyObject *noargs)
845842
{
846843
my_ulonglong ret;
847-
DECLARE_CONNECTION_GUARD;
848844
BEGIN_CONNECTION_OPERATION(self, return _mysql_Exception(self));
849845
ret = mysql_affected_rows(&(self->connection));
850846
END_CONNECTION_LOCK(self);
@@ -882,7 +878,6 @@ _mysql_ConnectionObject_dump_debug_info(
882878
PyObject *noargs)
883879
{
884880
int err;
885-
DECLARE_CONNECTION_GUARD;
886881
BEGIN_CONNECTION_OPERATION(self, return _mysql_Exception(self));
887882
Py_BEGIN_ALLOW_THREADS
888883
err = mysql_dump_debug_info(&(self->connection));
@@ -905,7 +900,6 @@ _mysql_ConnectionObject_autocommit(
905900
PyObject *args)
906901
{
907902
int flag, err;
908-
DECLARE_CONNECTION_GUARD;
909903
if (!PyArg_ParseTuple(args, "i", &flag)) return NULL;
910904
BEGIN_CONNECTION_OPERATION(self, return _mysql_Exception(self));
911905
Py_BEGIN_ALLOW_THREADS
@@ -928,7 +922,6 @@ _mysql_ConnectionObject_get_autocommit(
928922
_mysql_ConnectionObject *self,
929923
PyObject *args)
930924
{
931-
DECLARE_CONNECTION_GUARD;
932925
BEGIN_CONNECTION_OPERATION(self, return _mysql_Exception(self));
933926
if (self->connection.server_status & SERVER_STATUS_AUTOCOMMIT) {
934927
END_CONNECTION_LOCK(self);
@@ -947,7 +940,6 @@ _mysql_ConnectionObject_commit(
947940
PyObject *noargs)
948941
{
949942
int err;
950-
DECLARE_CONNECTION_GUARD;
951943
BEGIN_CONNECTION_OPERATION(self, return _mysql_Exception(self));
952944
Py_BEGIN_ALLOW_THREADS
953945
err = mysql_commit(&(self->connection));
@@ -970,7 +962,6 @@ _mysql_ConnectionObject_rollback(
970962
PyObject *noargs)
971963
{
972964
int err;
973-
DECLARE_CONNECTION_GUARD;
974965
BEGIN_CONNECTION_OPERATION(self, return _mysql_Exception(self));
975966
Py_BEGIN_ALLOW_THREADS
976967
err = mysql_rollback(&(self->connection));
@@ -1003,7 +994,6 @@ _mysql_ConnectionObject_next_result(
1003994
PyObject *noargs)
1004995
{
1005996
int err;
1006-
DECLARE_CONNECTION_GUARD;
1007997
BEGIN_CONNECTION_OPERATION(self, return _mysql_Exception(self));
1008998
Py_BEGIN_ALLOW_THREADS
1009999
err = mysql_next_result(&(self->connection));
@@ -1030,7 +1020,6 @@ _mysql_ConnectionObject_set_server_option(
10301020
PyObject *args)
10311021
{
10321022
int err, flags=0;
1033-
DECLARE_CONNECTION_GUARD;
10341023
if (!PyArg_ParseTuple(args, "i", &flags))
10351024
return NULL;
10361025
BEGIN_CONNECTION_OPERATION(self, return _mysql_Exception(self));
@@ -1064,7 +1053,6 @@ _mysql_ConnectionObject_sqlstate(
10641053
PyObject *noargs)
10651054
{
10661055
PyObject *ret;
1067-
DECLARE_CONNECTION_GUARD;
10681056
BEGIN_CONNECTION_OPERATION(self, return _mysql_Exception(self));
10691057
ret = PyUnicode_FromString(mysql_sqlstate(&(self->connection)));
10701058
END_CONNECTION_LOCK(self);
@@ -1083,7 +1071,6 @@ _mysql_ConnectionObject_warning_count(
10831071
PyObject *noargs)
10841072
{
10851073
unsigned int count;
1086-
DECLARE_CONNECTION_GUARD;
10871074
BEGIN_CONNECTION_OPERATION(self, return _mysql_Exception(self));
10881075
count = mysql_warning_count(&(self->connection));
10891076
END_CONNECTION_LOCK(self);
@@ -1102,7 +1089,6 @@ _mysql_ConnectionObject_errno(
11021089
PyObject *noargs)
11031090
{
11041091
unsigned int err;
1105-
DECLARE_CONNECTION_GUARD;
11061092
BEGIN_CONNECTION_OPERATION(self, return _mysql_Exception(self));
11071093
err = mysql_errno(&(self->connection));
11081094
END_CONNECTION_LOCK(self);
@@ -1121,7 +1107,6 @@ _mysql_ConnectionObject_error(
11211107
PyObject *noargs)
11221108
{
11231109
PyObject *ret;
1124-
DECLARE_CONNECTION_GUARD;
11251110
BEGIN_CONNECTION_OPERATION(self, return _mysql_Exception(self));
11261111
ret = PyUnicode_FromString(mysql_error(&(self->connection)));
11271112
END_CONNECTION_LOCK(self);
@@ -1146,7 +1131,6 @@ _mysql_escape_string(
11461131
unsigned long len;
11471132
Py_ssize_t size;
11481133
int use_connection = 0;
1149-
DECLARE_CONNECTION_GUARD;
11501134
if (!PyArg_ParseTuple(args, "s#:escape_string", &in, &size)) return NULL;
11511135
str = PyBytes_FromStringAndSize((char *) NULL, size*2+1);
11521136
if (!str) return PyErr_NoMemory();
@@ -1195,7 +1179,6 @@ _mysql_string_literal(
11951179
PyObject *s; // input string or bytes. need to decref.
11961180
int use_connection = 0;
11971181
PyObject *str = NULL;
1198-
DECLARE_CONNECTION_GUARD;
11991182

12001183
if (self && PyModule_Check((PyObject*)self))
12011184
self = NULL;
@@ -1312,7 +1295,6 @@ _mysql_escape(
13121295
{
13131296
PyObject *o=NULL, *d=NULL;
13141297
PyObject *converter = NULL;
1315-
DECLARE_CONNECTION_GUARD;
13161298
if (!PyArg_ParseTuple(args, "O|O:escape", &o, &d))
13171299
return NULL;
13181300
if (d) {
@@ -1354,7 +1336,6 @@ _mysql_ResultObject_describe(
13541336
PyObject *d;
13551337
MYSQL_FIELD *fields;
13561338
unsigned int i, n;
1357-
DECLARE_CONNECTION_GUARD;
13581339

13591340
BEGIN_RESULT_OPERATION(self, return _mysql_Exception(result_connection(self)));
13601341

@@ -1404,7 +1385,6 @@ _mysql_ResultObject_field_flags(
14041385
PyObject *d;
14051386
MYSQL_FIELD *fields;
14061387
unsigned int i, n;
1407-
DECLARE_CONNECTION_GUARD;
14081388
BEGIN_RESULT_OPERATION(self, return _mysql_Exception(result_connection(self)));
14091389
n = mysql_num_fields(self->result);
14101390
fields = mysql_fetch_fields(self->result);
@@ -1720,7 +1700,6 @@ _mysql_ResultObject_fetch_row(
17201700
static char *kwlist[] = {"maxrows", "how", NULL };
17211701
int maxrows=1, how=0;
17221702
PyObject *r=NULL;
1723-
DECLARE_CONNECTION_GUARD;
17241703

17251704
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|ii:fetch_row", kwlist,
17261705
&maxrows, &how))
@@ -1764,7 +1743,6 @@ _mysql_ResultObject_discard(
17641743
_mysql_ResultObject *self,
17651744
PyObject *noargs)
17661745
{
1767-
DECLARE_CONNECTION_GUARD;
17681746
BEGIN_RESULT_OPERATION(self, return _mysql_Exception(result_connection(self)));
17691747

17701748
MYSQL_ROW row;
@@ -1806,7 +1784,6 @@ _mysql_ConnectionObject_change_user(
18061784
PyObject *args,
18071785
PyObject *kwargs)
18081786
{
1809-
DECLARE_CONNECTION_GUARD;
18101787
char *user, *pwd=NULL, *db=NULL;
18111788
int r;
18121789
static char *kwlist[] = { "user", "passwd", "db", NULL } ;
@@ -1837,7 +1814,6 @@ _mysql_ConnectionObject_character_set_name(
18371814
_mysql_ConnectionObject *self,
18381815
PyObject *noargs)
18391816
{
1840-
DECLARE_CONNECTION_GUARD;
18411817
const char *s;
18421818
PyObject *ret;
18431819

@@ -1858,7 +1834,6 @@ _mysql_ConnectionObject_set_character_set(
18581834
_mysql_ConnectionObject *self,
18591835
PyObject *args)
18601836
{
1861-
DECLARE_CONNECTION_GUARD;
18621837
const char *s;
18631838
int err;
18641839

@@ -1903,7 +1878,6 @@ _mysql_ConnectionObject_get_character_set_info(
19031878
_mysql_ConnectionObject *self,
19041879
PyObject *noargs)
19051880
{
1906-
DECLARE_CONNECTION_GUARD;
19071881
PyObject *result;
19081882
MY_CHARSET_INFO cs;
19091883

@@ -1943,7 +1917,6 @@ _mysql_ConnectionObject_get_native_connection(
19431917
_mysql_ConnectionObject *self,
19441918
PyObject *noargs)
19451919
{
1946-
DECLARE_CONNECTION_GUARD;
19471920
PyObject *result;
19481921

19491922
BEGIN_CONNECTION_OPERATION(self, return _mysql_Exception(self));
@@ -1975,7 +1948,6 @@ _mysql_ConnectionObject_get_host_info(
19751948
_mysql_ConnectionObject *self,
19761949
PyObject *noargs)
19771950
{
1978-
DECLARE_CONNECTION_GUARD;
19791951
PyObject *ret;
19801952

19811953
BEGIN_CONNECTION_OPERATION(self, return _mysql_Exception(self));
@@ -1994,7 +1966,6 @@ _mysql_ConnectionObject_get_proto_info(
19941966
_mysql_ConnectionObject *self,
19951967
PyObject *noargs)
19961968
{
1997-
DECLARE_CONNECTION_GUARD;
19981969
unsigned int proto;
19991970

20001971
BEGIN_CONNECTION_OPERATION(self, return _mysql_Exception(self));
@@ -2013,7 +1984,6 @@ _mysql_ConnectionObject_get_server_info(
20131984
_mysql_ConnectionObject *self,
20141985
PyObject *noargs)
20151986
{
2016-
DECLARE_CONNECTION_GUARD;
20171987
PyObject *ret;
20181988

20191989
BEGIN_CONNECTION_OPERATION(self, return _mysql_Exception(self));
@@ -2033,7 +2003,6 @@ _mysql_ConnectionObject_info(
20332003
_mysql_ConnectionObject *self,
20342004
PyObject *noargs)
20352005
{
2036-
DECLARE_CONNECTION_GUARD;
20372006
const char *s;
20382007
PyObject *ret;
20392008

@@ -2074,7 +2043,6 @@ _mysql_ConnectionObject_insert_id(
20742043
_mysql_ConnectionObject *self,
20752044
PyObject *noargs)
20762045
{
2077-
DECLARE_CONNECTION_GUARD;
20782046
my_ulonglong r;
20792047

20802048
BEGIN_CONNECTION_OPERATION(self, return _mysql_Exception(self));
@@ -2092,7 +2060,6 @@ _mysql_ConnectionObject_kill(
20922060
_mysql_ConnectionObject *self,
20932061
PyObject *args)
20942062
{
2095-
DECLARE_CONNECTION_GUARD;
20962063
unsigned long pid;
20972064
int r;
20982065
char query[50];
@@ -2123,7 +2090,6 @@ _mysql_ConnectionObject_field_count(
21232090
_mysql_ConnectionObject *self,
21242091
PyObject *noargs)
21252092
{
2126-
DECLARE_CONNECTION_GUARD;
21272093
unsigned int count;
21282094

21292095
BEGIN_CONNECTION_OPERATION(self, return _mysql_Exception(self));
@@ -2142,7 +2108,6 @@ _mysql_ConnectionObject_fileno(
21422108
_mysql_ConnectionObject *self,
21432109
PyObject *noargs)
21442110
{
2145-
DECLARE_CONNECTION_GUARD;
21462111
int fd;
21472112

21482113
BEGIN_CONNECTION_OPERATION(self, return _mysql_Exception(self));
@@ -2159,7 +2124,6 @@ _mysql_ResultObject_num_fields(
21592124
_mysql_ResultObject *self,
21602125
PyObject *noargs)
21612126
{
2162-
DECLARE_CONNECTION_GUARD;
21632127
unsigned int fields;
21642128

21652129
BEGIN_RESULT_OPERATION(self, return _mysql_Exception(result_connection(self)));
@@ -2179,7 +2143,6 @@ _mysql_ResultObject_num_rows(
21792143
_mysql_ResultObject *self,
21802144
PyObject *noargs)
21812145
{
2182-
DECLARE_CONNECTION_GUARD;
21832146
my_ulonglong rows;
21842147

21852148
BEGIN_RESULT_OPERATION(self, return _mysql_Exception(result_connection(self)));
@@ -2212,7 +2175,6 @@ _mysql_ConnectionObject_ping(
22122175
_mysql_ConnectionObject *self,
22132176
PyObject *args)
22142177
{
2215-
DECLARE_CONNECTION_GUARD;
22162178
int reconnect = 0;
22172179

22182180
if (!PyArg_ParseTuple(args, "|p", &reconnect)) return NULL;
@@ -2251,7 +2213,6 @@ _mysql_ConnectionObject_query(
22512213
_mysql_ConnectionObject *self,
22522214
PyObject *args)
22532215
{
2254-
DECLARE_CONNECTION_GUARD;
22552216
char *query;
22562217
Py_ssize_t len;
22572218
int r;
@@ -2281,7 +2242,6 @@ _mysql_ConnectionObject_send_query(
22812242
_mysql_ConnectionObject *self,
22822243
PyObject *args)
22832244
{
2284-
DECLARE_CONNECTION_GUARD;
22852245
char *query;
22862246
Py_ssize_t len;
22872247
int r;
@@ -2311,7 +2271,6 @@ _mysql_ConnectionObject_read_query_result(
23112271
_mysql_ConnectionObject *self,
23122272
PyObject *noargs)
23132273
{
2314-
DECLARE_CONNECTION_GUARD;
23152274
int r;
23162275
MYSQL *mysql = &(self->connection);
23172276

@@ -2346,7 +2305,6 @@ _mysql_ConnectionObject_select_db(
23462305
_mysql_ConnectionObject *self,
23472306
PyObject *args)
23482307
{
2349-
DECLARE_CONNECTION_GUARD;
23502308
char *db;
23512309
int r;
23522310

@@ -2374,7 +2332,6 @@ _mysql_ConnectionObject_shutdown(
23742332
_mysql_ConnectionObject *self,
23752333
PyObject *noargs)
23762334
{
2377-
DECLARE_CONNECTION_GUARD;
23782335
int r;
23792336

23802337
BEGIN_CONNECTION_OPERATION(self, return _mysql_Exception(self));
@@ -2402,7 +2359,6 @@ _mysql_ConnectionObject_stat(
24022359
_mysql_ConnectionObject *self,
24032360
PyObject *noargs)
24042361
{
2405-
DECLARE_CONNECTION_GUARD;
24062362
const char *s;
24072363
PyObject *ret;
24082364

@@ -2431,7 +2387,6 @@ _mysql_ConnectionObject_store_result(
24312387
_mysql_ConnectionObject *self,
24322388
PyObject *noargs)
24332389
{
2434-
DECLARE_CONNECTION_GUARD;
24352390
PyObject *arglist=NULL, *kwarglist=NULL, *result=NULL;
24362391
_mysql_ResultObject *r=NULL;
24372392

@@ -2476,7 +2431,6 @@ _mysql_ConnectionObject_thread_id(
24762431
_mysql_ConnectionObject *self,
24772432
PyObject *noargs)
24782433
{
2479-
DECLARE_CONNECTION_GUARD;
24802434
unsigned long pid;
24812435

24822436
BEGIN_CONNECTION_OPERATION(self, return _mysql_Exception(self));
@@ -2496,7 +2450,6 @@ _mysql_ConnectionObject_use_result(
24962450
_mysql_ConnectionObject *self,
24972451
PyObject *noargs)
24982452
{
2499-
DECLARE_CONNECTION_GUARD;
25002453
PyObject *arglist=NULL, *kwarglist=NULL, *result=NULL;
25012454
_mysql_ResultObject *r=NULL;
25022455

@@ -2534,7 +2487,6 @@ _mysql_ConnectionObject_discard_result(
25342487
_mysql_ConnectionObject *self,
25352488
PyObject *noargs)
25362489
{
2537-
DECLARE_CONNECTION_GUARD;
25382490
MYSQL_RES *res;
25392491
MYSQL_ROW row;
25402492
int err = 0;
@@ -2600,7 +2552,6 @@ _mysql_ResultObject_data_seek(
26002552
_mysql_ResultObject *self,
26012553
PyObject *args)
26022554
{
2603-
DECLARE_CONNECTION_GUARD;
26042555
unsigned int row;
26052556

26062557
if (!PyArg_ParseTuple(args, "i:data_seek", &row)) return NULL;
@@ -2614,7 +2565,6 @@ static void
26142565
_mysql_ResultObject_dealloc(
26152566
_mysql_ResultObject *self)
26162567
{
2617-
DECLARE_CONNECTION_GUARD;
26182568
PyObject *conn = self->conn;
26192569
PyObject_GC_UnTrack((PyObject *)self);
26202570
if (conn != NULL) {

0 commit comments

Comments
 (0)