Skip to content

Commit cef2972

Browse files
WillAydjreback
WillAyd
authored and
jreback
committed
marked unused parameters (#30504)
1 parent 7a544f0 commit cef2972

File tree

1 file changed

+66
-45
lines changed

1 file changed

+66
-45
lines changed

‎pandas/_libs/src/ujson/python/objToJSON.c

+66-45
Original file line numberDiff line numberDiff line change
@@ -396,18 +396,21 @@ static PyObject *get_item(PyObject *obj, Py_ssize_t i) {
396396
return ret;
397397
}
398398

399-
static char *PyBytesToUTF8(JSOBJ _obj, JSONTypeContext *tc, size_t *_outLen) {
399+
static char *PyBytesToUTF8(JSOBJ _obj, JSONTypeContext *Py_UNUSED(tc),
400+
size_t *_outLen) {
400401
PyObject *obj = (PyObject *)_obj;
401402
*_outLen = PyBytes_GET_SIZE(obj);
402403
return PyBytes_AS_STRING(obj);
403404
}
404405

405-
static char *PyUnicodeToUTF8(JSOBJ _obj, JSONTypeContext *tc, size_t *_outLen) {
406+
static char *PyUnicodeToUTF8(JSOBJ _obj, JSONTypeContext *Py_UNUSED(tc),
407+
size_t *_outLen) {
406408
return (char *)PyUnicode_AsUTF8AndSize(_obj, (Py_ssize_t *)_outLen);
407409
}
408410

409411
/* returns a char* and mutates the pointer to *len */
410-
static char *NpyDateTimeToIso(JSOBJ unused, JSONTypeContext *tc, size_t *len) {
412+
static char *NpyDateTimeToIso(JSOBJ Py_UNUSED(obj), JSONTypeContext *tc,
413+
size_t *len) {
411414
npy_datetimestruct dts;
412415
int ret_code;
413416
int64_t longVal = GET_TC(tc)->longValue;
@@ -537,7 +540,7 @@ static char *PyTimeToJSON(JSOBJ _obj, JSONTypeContext *tc, size_t *outLen) {
537540
// Numpy array iteration functions
538541
//=============================================================================
539542

540-
static void NpyArr_freeItemValue(JSOBJ _obj, JSONTypeContext *tc) {
543+
static void NpyArr_freeItemValue(JSOBJ Py_UNUSED(_obj), JSONTypeContext *tc) {
541544
if (GET_TC(tc)->npyarr &&
542545
GET_TC(tc)->itemValue != GET_TC(tc)->npyarr->array) {
543546
PRINTMARK();
@@ -546,7 +549,9 @@ static void NpyArr_freeItemValue(JSOBJ _obj, JSONTypeContext *tc) {
546549
}
547550
}
548551

549-
int NpyArr_iterNextNone(JSOBJ _obj, JSONTypeContext *tc) { return 0; }
552+
int NpyArr_iterNextNone(JSOBJ Py_UNUSED(_obj), JSONTypeContext *Py_UNUSED(tc)) {
553+
return 0;
554+
}
550555

551556
void NpyArr_iterBegin(JSOBJ _obj, JSONTypeContext *tc) {
552557
PyArrayObject *obj;
@@ -603,7 +608,10 @@ void NpyArr_iterEnd(JSOBJ obj, JSONTypeContext *tc) {
603608
}
604609
}
605610

606-
void NpyArrPassThru_iterBegin(JSOBJ obj, JSONTypeContext *tc) { PRINTMARK(); }
611+
void NpyArrPassThru_iterBegin(JSOBJ Py_UNUSED(obj),
612+
JSONTypeContext *Py_UNUSED(tc)) {
613+
PRINTMARK();
614+
}
607615

608616
void NpyArrPassThru_iterEnd(JSOBJ obj, JSONTypeContext *tc) {
609617
NpyArrContext *npyarr = GET_TC(tc)->npyarr;
@@ -682,12 +690,13 @@ int NpyArr_iterNext(JSOBJ _obj, JSONTypeContext *tc) {
682690
return 1;
683691
}
684692

685-
JSOBJ NpyArr_iterGetValue(JSOBJ obj, JSONTypeContext *tc) {
693+
JSOBJ NpyArr_iterGetValue(JSOBJ Py_UNUSED(obj), JSONTypeContext *tc) {
686694
PRINTMARK();
687695
return GET_TC(tc)->itemValue;
688696
}
689697

690-
char *NpyArr_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen) {
698+
char *NpyArr_iterGetName(JSOBJ Py_UNUSED(obj), JSONTypeContext *tc,
699+
size_t *outLen) {
691700
NpyArrContext *npyarr = GET_TC(tc)->npyarr;
692701
npy_intp idx;
693702
PRINTMARK();
@@ -741,7 +750,8 @@ int PdBlock_iterNextItem(JSOBJ obj, JSONTypeContext *tc) {
741750
return NpyArr_iterNextItem(obj, tc);
742751
}
743752

744-
char *PdBlock_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen) {
753+
char *PdBlock_iterGetName(JSOBJ Py_UNUSED(obj), JSONTypeContext *tc,
754+
size_t *outLen) {
745755
PdBlockContext *blkCtxt = GET_TC(tc)->pdblock;
746756
NpyArrContext *npyarr = blkCtxt->npyCtxts[0];
747757
npy_intp idx;
@@ -763,7 +773,7 @@ char *PdBlock_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen) {
763773
return cStr;
764774
}
765775

766-
char *PdBlock_iterGetName_Transpose(JSOBJ obj, JSONTypeContext *tc,
776+
char *PdBlock_iterGetName_Transpose(JSOBJ Py_UNUSED(obj), JSONTypeContext *tc,
767777
size_t *outLen) {
768778
PdBlockContext *blkCtxt = GET_TC(tc)->pdblock;
769779
NpyArrContext *npyarr = blkCtxt->npyCtxts[blkCtxt->colIdx];
@@ -809,7 +819,7 @@ int PdBlock_iterNext(JSOBJ obj, JSONTypeContext *tc) {
809819
return 1;
810820
}
811821

812-
void PdBlockPassThru_iterBegin(JSOBJ obj, JSONTypeContext *tc) {
822+
void PdBlockPassThru_iterBegin(JSOBJ Py_UNUSED(obj), JSONTypeContext *tc) {
813823
PdBlockContext *blkCtxt = GET_TC(tc)->pdblock;
814824
PRINTMARK();
815825

@@ -1041,13 +1051,14 @@ int Tuple_iterNext(JSOBJ obj, JSONTypeContext *tc) {
10411051
return 1;
10421052
}
10431053

1044-
void Tuple_iterEnd(JSOBJ obj, JSONTypeContext *tc) {}
1054+
void Tuple_iterEnd(JSOBJ Py_UNUSED(obj), JSONTypeContext *Py_UNUSED(tc)) {}
10451055

1046-
JSOBJ Tuple_iterGetValue(JSOBJ obj, JSONTypeContext *tc) {
1056+
JSOBJ Tuple_iterGetValue(JSOBJ Py_UNUSED(obj), JSONTypeContext *tc) {
10471057
return GET_TC(tc)->itemValue;
10481058
}
10491059

1050-
char *Tuple_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen) {
1060+
char *Tuple_iterGetName(JSOBJ Py_UNUSED(obj), JSONTypeContext *Py_UNUSED(tc),
1061+
size_t *Py_UNUSED(outLen)) {
10511062
return NULL;
10521063
}
10531064

@@ -1060,7 +1071,7 @@ void Iter_iterBegin(JSOBJ obj, JSONTypeContext *tc) {
10601071
GET_TC(tc)->iterator = PyObject_GetIter(obj);
10611072
}
10621073

1063-
int Iter_iterNext(JSOBJ obj, JSONTypeContext *tc) {
1074+
int Iter_iterNext(JSOBJ Py_UNUSED(obj), JSONTypeContext *tc) {
10641075
PyObject *item;
10651076

10661077
if (GET_TC(tc)->itemValue) {
@@ -1078,7 +1089,7 @@ int Iter_iterNext(JSOBJ obj, JSONTypeContext *tc) {
10781089
return 1;
10791090
}
10801091

1081-
void Iter_iterEnd(JSOBJ obj, JSONTypeContext *tc) {
1092+
void Iter_iterEnd(JSOBJ Py_UNUSED(obj), JSONTypeContext *tc) {
10821093
if (GET_TC(tc)->itemValue) {
10831094
Py_DECREF(GET_TC(tc)->itemValue);
10841095
GET_TC(tc)->itemValue = NULL;
@@ -1090,11 +1101,12 @@ void Iter_iterEnd(JSOBJ obj, JSONTypeContext *tc) {
10901101
}
10911102
}
10921103

1093-
JSOBJ Iter_iterGetValue(JSOBJ obj, JSONTypeContext *tc) {
1104+
JSOBJ Iter_iterGetValue(JSOBJ Py_UNUSED(obj), JSONTypeContext *tc) {
10941105
return GET_TC(tc)->itemValue;
10951106
}
10961107

1097-
char *Iter_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen) {
1108+
char *Iter_iterGetName(JSOBJ Py_UNUSED(obj), JSONTypeContext *Py_UNUSED(tc),
1109+
size_t *Py_UNUSED(outLen)) {
10981110
return NULL;
10991111
}
11001112

@@ -1110,7 +1122,7 @@ void Dir_iterBegin(JSOBJ obj, JSONTypeContext *tc) {
11101122
PRINTMARK();
11111123
}
11121124

1113-
void Dir_iterEnd(JSOBJ obj, JSONTypeContext *tc) {
1125+
void Dir_iterEnd(JSOBJ Py_UNUSED(obj), JSONTypeContext *tc) {
11141126
if (GET_TC(tc)->itemValue) {
11151127
Py_DECREF(GET_TC(tc)->itemValue);
11161128
GET_TC(tc)->itemValue = NULL;
@@ -1196,12 +1208,13 @@ int Dir_iterNext(JSOBJ _obj, JSONTypeContext *tc) {
11961208
return 1;
11971209
}
11981210

1199-
JSOBJ Dir_iterGetValue(JSOBJ obj, JSONTypeContext *tc) {
1211+
JSOBJ Dir_iterGetValue(JSOBJ Py_UNUSED(obj), JSONTypeContext *tc) {
12001212
PRINTMARK();
12011213
return GET_TC(tc)->itemValue;
12021214
}
12031215

1204-
char *Dir_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen) {
1216+
char *Dir_iterGetName(JSOBJ Py_UNUSED(obj), JSONTypeContext *tc,
1217+
size_t *outLen) {
12051218
PRINTMARK();
12061219
*outLen = PyBytes_GET_SIZE(GET_TC(tc)->itemName);
12071220
return PyBytes_AS_STRING(GET_TC(tc)->itemName);
@@ -1227,20 +1240,21 @@ int List_iterNext(JSOBJ obj, JSONTypeContext *tc) {
12271240
return 1;
12281241
}
12291242

1230-
void List_iterEnd(JSOBJ obj, JSONTypeContext *tc) {}
1243+
void List_iterEnd(JSOBJ Py_UNUSED(obj), JSONTypeContext *Py_UNUSED(tc)) {}
12311244

1232-
JSOBJ List_iterGetValue(JSOBJ obj, JSONTypeContext *tc) {
1245+
JSOBJ List_iterGetValue(JSOBJ Py_UNUSED(obj), JSONTypeContext *tc) {
12331246
return GET_TC(tc)->itemValue;
12341247
}
12351248

1236-
char *List_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen) {
1249+
char *List_iterGetName(JSOBJ Py_UNUSED(obj), JSONTypeContext *Py_UNUSED(tc),
1250+
size_t *Py_UNUSED(outLen)) {
12371251
return NULL;
12381252
}
12391253

12401254
//=============================================================================
12411255
// pandas Index iteration functions
12421256
//=============================================================================
1243-
void Index_iterBegin(JSOBJ obj, JSONTypeContext *tc) {
1257+
void Index_iterBegin(JSOBJ Py_UNUSED(obj), JSONTypeContext *tc) {
12441258
GET_TC(tc)->index = 0;
12451259
GET_TC(tc)->cStr = PyObject_Malloc(20 * sizeof(char));
12461260
if (!GET_TC(tc)->cStr) {
@@ -1276,21 +1290,24 @@ int Index_iterNext(JSOBJ obj, JSONTypeContext *tc) {
12761290
return 1;
12771291
}
12781292

1279-
void Index_iterEnd(JSOBJ obj, JSONTypeContext *tc) { PRINTMARK(); }
1293+
void Index_iterEnd(JSOBJ Py_UNUSED(obj), JSONTypeContext *Py_UNUSED(tc)) {
1294+
PRINTMARK();
1295+
}
12801296

1281-
JSOBJ Index_iterGetValue(JSOBJ obj, JSONTypeContext *tc) {
1297+
JSOBJ Index_iterGetValue(JSOBJ Py_UNUSED(obj), JSONTypeContext *tc) {
12821298
return GET_TC(tc)->itemValue;
12831299
}
12841300

1285-
char *Index_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen) {
1301+
char *Index_iterGetName(JSOBJ Py_UNUSED(obj), JSONTypeContext *tc,
1302+
size_t *outLen) {
12861303
*outLen = strlen(GET_TC(tc)->cStr);
12871304
return GET_TC(tc)->cStr;
12881305
}
12891306

12901307
//=============================================================================
12911308
// pandas Series iteration functions
12921309
//=============================================================================
1293-
void Series_iterBegin(JSOBJ obj, JSONTypeContext *tc) {
1310+
void Series_iterBegin(JSOBJ Py_UNUSED(obj), JSONTypeContext *tc) {
12941311
PyObjectEncoder *enc = (PyObjectEncoder *)tc->encoder;
12951312
GET_TC(tc)->index = 0;
12961313
GET_TC(tc)->cStr = PyObject_Malloc(20 * sizeof(char));
@@ -1331,25 +1348,26 @@ int Series_iterNext(JSOBJ obj, JSONTypeContext *tc) {
13311348
return 1;
13321349
}
13331350

1334-
void Series_iterEnd(JSOBJ obj, JSONTypeContext *tc) {
1351+
void Series_iterEnd(JSOBJ Py_UNUSED(obj), JSONTypeContext *tc) {
13351352
PyObjectEncoder *enc = (PyObjectEncoder *)tc->encoder;
13361353
enc->outputFormat = enc->originalOutputFormat;
13371354
PRINTMARK();
13381355
}
13391356

1340-
JSOBJ Series_iterGetValue(JSOBJ obj, JSONTypeContext *tc) {
1357+
JSOBJ Series_iterGetValue(JSOBJ Py_UNUSED(obj), JSONTypeContext *tc) {
13411358
return GET_TC(tc)->itemValue;
13421359
}
13431360

1344-
char *Series_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen) {
1361+
char *Series_iterGetName(JSOBJ Py_UNUSED(obj), JSONTypeContext *tc,
1362+
size_t *outLen) {
13451363
*outLen = strlen(GET_TC(tc)->cStr);
13461364
return GET_TC(tc)->cStr;
13471365
}
13481366

13491367
//=============================================================================
13501368
// pandas DataFrame iteration functions
13511369
//=============================================================================
1352-
void DataFrame_iterBegin(JSOBJ obj, JSONTypeContext *tc) {
1370+
void DataFrame_iterBegin(JSOBJ Py_UNUSED(obj), JSONTypeContext *tc) {
13531371
PyObjectEncoder *enc = (PyObjectEncoder *)tc->encoder;
13541372
GET_TC(tc)->index = 0;
13551373
GET_TC(tc)->cStr = PyObject_Malloc(20 * sizeof(char));
@@ -1395,17 +1413,18 @@ int DataFrame_iterNext(JSOBJ obj, JSONTypeContext *tc) {
13951413
return 1;
13961414
}
13971415

1398-
void DataFrame_iterEnd(JSOBJ obj, JSONTypeContext *tc) {
1416+
void DataFrame_iterEnd(JSOBJ Py_UNUSED(obj), JSONTypeContext *tc) {
13991417
PyObjectEncoder *enc = (PyObjectEncoder *)tc->encoder;
14001418
enc->outputFormat = enc->originalOutputFormat;
14011419
PRINTMARK();
14021420
}
14031421

1404-
JSOBJ DataFrame_iterGetValue(JSOBJ obj, JSONTypeContext *tc) {
1422+
JSOBJ DataFrame_iterGetValue(JSOBJ Py_UNUSED(obj), JSONTypeContext *tc) {
14051423
return GET_TC(tc)->itemValue;
14061424
}
14071425

1408-
char *DataFrame_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen) {
1426+
char *DataFrame_iterGetName(JSOBJ Py_UNUSED(obj), JSONTypeContext *tc,
1427+
size_t *outLen) {
14091428
*outLen = strlen(GET_TC(tc)->cStr);
14101429
return GET_TC(tc)->cStr;
14111430
}
@@ -1415,12 +1434,12 @@ char *DataFrame_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen) {
14151434
// itemName might converted to string (Python_Str). Do refCounting
14161435
// itemValue is borrowed from object (which is dict). No refCounting
14171436
//=============================================================================
1418-
void Dict_iterBegin(JSOBJ obj, JSONTypeContext *tc) {
1437+
void Dict_iterBegin(JSOBJ Py_UNUSED(obj), JSONTypeContext *tc) {
14191438
GET_TC(tc)->index = 0;
14201439
PRINTMARK();
14211440
}
14221441

1423-
int Dict_iterNext(JSOBJ obj, JSONTypeContext *tc) {
1442+
int Dict_iterNext(JSOBJ Py_UNUSED(obj), JSONTypeContext *tc) {
14241443
PyObject *itemNameTmp;
14251444

14261445
if (GET_TC(tc)->itemName) {
@@ -1448,7 +1467,7 @@ int Dict_iterNext(JSOBJ obj, JSONTypeContext *tc) {
14481467
return 1;
14491468
}
14501469

1451-
void Dict_iterEnd(JSOBJ obj, JSONTypeContext *tc) {
1470+
void Dict_iterEnd(JSOBJ Py_UNUSED(obj), JSONTypeContext *tc) {
14521471
if (GET_TC(tc)->itemName) {
14531472
Py_DECREF(GET_TC(tc)->itemName);
14541473
GET_TC(tc)->itemName = NULL;
@@ -1457,11 +1476,12 @@ void Dict_iterEnd(JSOBJ obj, JSONTypeContext *tc) {
14571476
PRINTMARK();
14581477
}
14591478

1460-
JSOBJ Dict_iterGetValue(JSOBJ obj, JSONTypeContext *tc) {
1479+
JSOBJ Dict_iterGetValue(JSOBJ Py_UNUSED(obj), JSONTypeContext *tc) {
14611480
return GET_TC(tc)->itemValue;
14621481
}
14631482

1464-
char *Dict_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen) {
1483+
char *Dict_iterGetName(JSOBJ Py_UNUSED(obj), JSONTypeContext *tc,
1484+
size_t *outLen) {
14651485
*outLen = PyBytes_GET_SIZE(GET_TC(tc)->itemName);
14661486
return PyBytes_AS_STRING(GET_TC(tc)->itemName);
14671487
}
@@ -2208,7 +2228,7 @@ void Object_beginTypeContext(JSOBJ _obj, JSONTypeContext *tc) {
22082228
return;
22092229
}
22102230

2211-
void Object_endTypeContext(JSOBJ obj, JSONTypeContext *tc) {
2231+
void Object_endTypeContext(JSOBJ Py_UNUSED(obj), JSONTypeContext *tc) {
22122232
PRINTMARK();
22132233
if (tc->prv) {
22142234
Py_XDECREF(GET_TC(tc)->newObj);
@@ -2234,11 +2254,11 @@ const char *Object_getStringValue(JSOBJ obj, JSONTypeContext *tc,
22342254
return GET_TC(tc)->PyTypeToUTF8(obj, tc, _outLen);
22352255
}
22362256

2237-
JSINT64 Object_getLongValue(JSOBJ obj, JSONTypeContext *tc) {
2257+
JSINT64 Object_getLongValue(JSOBJ Py_UNUSED(obj), JSONTypeContext *tc) {
22382258
return GET_TC(tc)->longValue;
22392259
}
22402260

2241-
double Object_getDoubleValue(JSOBJ obj, JSONTypeContext *tc) {
2261+
double Object_getDoubleValue(JSOBJ Py_UNUSED(obj), JSONTypeContext *tc) {
22422262
return GET_TC(tc)->doubleValue;
22432263
}
22442264

@@ -2264,7 +2284,8 @@ char *Object_iterGetName(JSOBJ obj, JSONTypeContext *tc, size_t *outLen) {
22642284
return GET_TC(tc)->iterGetName(obj, tc, outLen);
22652285
}
22662286

2267-
PyObject *objToJSON(PyObject *self, PyObject *args, PyObject *kwargs) {
2287+
PyObject *objToJSON(PyObject *Py_UNUSED(self), PyObject *args,
2288+
PyObject *kwargs) {
22682289
static char *kwlist[] = {"obj",
22692290
"ensure_ascii",
22702291
"double_precision",

0 commit comments

Comments
 (0)