Skip to content

Commit 111adaa

Browse files
methanemethane
committed
remove unused flags
1 parent 699f348 commit 111adaa

File tree

1 file changed

+38
-38
lines changed

1 file changed

+38
-38
lines changed

‎Python/modsupport.c

+38-38
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
typedef double va_double;
99

10-
static PyObject *va_build_value(const char *, va_list, int);
10+
static PyObject *va_build_value(const char *, va_list);
1111

1212

1313
int
@@ -82,21 +82,21 @@ countformat(const char *format, char endchar)
8282
/* Generic function to create a value -- the inverse of getargs() */
8383
/* After an original idea and first implementation by Steven Miale */
8484

85-
static PyObject *do_mktuple(const char**, va_list *, char, Py_ssize_t, int);
86-
static int do_mkstack(PyObject **, const char**, va_list *, char, Py_ssize_t, int);
87-
static PyObject *do_mklist(const char**, va_list *, char, Py_ssize_t, int);
88-
static PyObject *do_mkdict(const char**, va_list *, char, Py_ssize_t, int);
89-
static PyObject *do_mkvalue(const char**, va_list *, int);
85+
static PyObject *do_mktuple(const char**, va_list *, char, Py_ssize_t);
86+
static int do_mkstack(PyObject **, const char**, va_list *, char, Py_ssize_t);
87+
static PyObject *do_mklist(const char**, va_list *, char, Py_ssize_t);
88+
static PyObject *do_mkdict(const char**, va_list *, char, Py_ssize_t);
89+
static PyObject *do_mkvalue(const char**, va_list *);
9090

9191

9292
static void
93-
do_ignore(const char **p_format, va_list *p_va, char endchar, Py_ssize_t n, int flags)
93+
do_ignore(const char **p_format, va_list *p_va, char endchar, Py_ssize_t n)
9494
{
9595
assert(PyErr_Occurred());
9696
PyObject *v = PyTuple_New(n);
9797
for (Py_ssize_t i = 0; i < n; i++) {
9898
PyObject *exc = PyErr_GetRaisedException();
99-
PyObject *w = do_mkvalue(p_format, p_va, flags);
99+
PyObject *w = do_mkvalue(p_format, p_va);
100100
PyErr_SetRaisedException(exc);
101101
if (w != NULL) {
102102
if (v != NULL) {
@@ -119,7 +119,7 @@ do_ignore(const char **p_format, va_list *p_va, char endchar, Py_ssize_t n, int
119119
}
120120

121121
static PyObject *
122-
do_mkdict(const char **p_format, va_list *p_va, char endchar, Py_ssize_t n, int flags)
122+
do_mkdict(const char **p_format, va_list *p_va, char endchar, Py_ssize_t n)
123123
{
124124
PyObject *d;
125125
Py_ssize_t i;
@@ -128,27 +128,27 @@ do_mkdict(const char **p_format, va_list *p_va, char endchar, Py_ssize_t n, int
128128
if (n % 2) {
129129
PyErr_SetString(PyExc_SystemError,
130130
"Bad dict format");
131-
do_ignore(p_format, p_va, endchar, n, flags);
131+
do_ignore(p_format, p_va, endchar, n);
132132
return NULL;
133133
}
134134
/* Note that we can't bail immediately on error as this will leak
135135
refcounts on any 'N' arguments. */
136136
if ((d = PyDict_New()) == NULL) {
137-
do_ignore(p_format, p_va, endchar, n, flags);
137+
do_ignore(p_format, p_va, endchar, n);
138138
return NULL;
139139
}
140140
for (i = 0; i < n; i+= 2) {
141141
PyObject *k, *v;
142142

143-
k = do_mkvalue(p_format, p_va, flags);
143+
k = do_mkvalue(p_format, p_va);
144144
if (k == NULL) {
145-
do_ignore(p_format, p_va, endchar, n - i - 1, flags);
145+
do_ignore(p_format, p_va, endchar, n - i - 1);
146146
Py_DECREF(d);
147147
return NULL;
148148
}
149-
v = do_mkvalue(p_format, p_va, flags);
149+
v = do_mkvalue(p_format, p_va);
150150
if (v == NULL || PyDict_SetItem(d, k, v) < 0) {
151-
do_ignore(p_format, p_va, endchar, n - i - 2, flags);
151+
do_ignore(p_format, p_va, endchar, n - i - 2);
152152
Py_DECREF(k);
153153
Py_XDECREF(v);
154154
Py_DECREF(d);
@@ -169,7 +169,7 @@ do_mkdict(const char **p_format, va_list *p_va, char endchar, Py_ssize_t n, int
169169
}
170170

171171
static PyObject *
172-
do_mklist(const char **p_format, va_list *p_va, char endchar, Py_ssize_t n, int flags)
172+
do_mklist(const char **p_format, va_list *p_va, char endchar, Py_ssize_t n)
173173
{
174174
PyObject *v;
175175
Py_ssize_t i;
@@ -179,13 +179,13 @@ do_mklist(const char **p_format, va_list *p_va, char endchar, Py_ssize_t n, int
179179
refcounts on any 'N' arguments. */
180180
v = PyList_New(n);
181181
if (v == NULL) {
182-
do_ignore(p_format, p_va, endchar, n, flags);
182+
do_ignore(p_format, p_va, endchar, n);
183183
return NULL;
184184
}
185185
for (i = 0; i < n; i++) {
186-
PyObject *w = do_mkvalue(p_format, p_va, flags);
186+
PyObject *w = do_mkvalue(p_format, p_va);
187187
if (w == NULL) {
188-
do_ignore(p_format, p_va, endchar, n - i - 1, flags);
188+
do_ignore(p_format, p_va, endchar, n - i - 1);
189189
Py_DECREF(v);
190190
return NULL;
191191
}
@@ -204,7 +204,7 @@ do_mklist(const char **p_format, va_list *p_va, char endchar, Py_ssize_t n, int
204204

205205
static int
206206
do_mkstack(PyObject **stack, const char **p_format, va_list *p_va,
207-
char endchar, Py_ssize_t n, int flags)
207+
char endchar, Py_ssize_t n)
208208
{
209209
Py_ssize_t i;
210210

@@ -214,9 +214,9 @@ do_mkstack(PyObject **stack, const char **p_format, va_list *p_va,
214214
/* Note that we can't bail immediately on error as this will leak
215215
refcounts on any 'N' arguments. */
216216
for (i = 0; i < n; i++) {
217-
PyObject *w = do_mkvalue(p_format, p_va, flags);
217+
PyObject *w = do_mkvalue(p_format, p_va);
218218
if (w == NULL) {
219-
do_ignore(p_format, p_va, endchar, n - i - 1, flags);
219+
do_ignore(p_format, p_va, endchar, n - i - 1);
220220
goto error;
221221
}
222222
stack[i] = w;
@@ -240,7 +240,7 @@ do_mkstack(PyObject **stack, const char **p_format, va_list *p_va,
240240
}
241241

242242
static PyObject *
243-
do_mktuple(const char **p_format, va_list *p_va, char endchar, Py_ssize_t n, int flags)
243+
do_mktuple(const char **p_format, va_list *p_va, char endchar, Py_ssize_t n)
244244
{
245245
PyObject *v;
246246
Py_ssize_t i;
@@ -249,13 +249,13 @@ do_mktuple(const char **p_format, va_list *p_va, char endchar, Py_ssize_t n, int
249249
/* Note that we can't bail immediately on error as this will leak
250250
refcounts on any 'N' arguments. */
251251
if ((v = PyTuple_New(n)) == NULL) {
252-
do_ignore(p_format, p_va, endchar, n, flags);
252+
do_ignore(p_format, p_va, endchar, n);
253253
return NULL;
254254
}
255255
for (i = 0; i < n; i++) {
256-
PyObject *w = do_mkvalue(p_format, p_va, flags);
256+
PyObject *w = do_mkvalue(p_format, p_va);
257257
if (w == NULL) {
258-
do_ignore(p_format, p_va, endchar, n - i - 1, flags);
258+
do_ignore(p_format, p_va, endchar, n - i - 1);
259259
Py_DECREF(v);
260260
return NULL;
261261
}
@@ -273,21 +273,21 @@ do_mktuple(const char **p_format, va_list *p_va, char endchar, Py_ssize_t n, int
273273
}
274274

275275
static PyObject *
276-
do_mkvalue(const char **p_format, va_list *p_va, int flags)
276+
do_mkvalue(const char **p_format, va_list *p_va)
277277
{
278278
for (;;) {
279279
switch (*(*p_format)++) {
280280
case '(':
281281
return do_mktuple(p_format, p_va, ')',
282-
countformat(*p_format, ')'), flags);
282+
countformat(*p_format, ')'));
283283

284284
case '[':
285285
return do_mklist(p_format, p_va, ']',
286-
countformat(*p_format, ']'), flags);
286+
countformat(*p_format, ']'));
287287

288288
case '{':
289289
return do_mkdict(p_format, p_va, '}',
290-
countformat(*p_format, '}'), flags);
290+
countformat(*p_format, '}'));
291291

292292
case 'b':
293293
case 'B':
@@ -481,7 +481,7 @@ Py_BuildValue(const char *format, ...)
481481
va_list va;
482482
PyObject* retval;
483483
va_start(va, format);
484-
retval = va_build_value(format, va, 0);
484+
retval = va_build_value(format, va);
485485
va_end(va);
486486
return retval;
487487
}
@@ -492,25 +492,25 @@ _Py_BuildValue_SizeT(const char *format, ...)
492492
va_list va;
493493
PyObject* retval;
494494
va_start(va, format);
495-
retval = va_build_value(format, va, 0);
495+
retval = va_build_value(format, va);
496496
va_end(va);
497497
return retval;
498498
}
499499

500500
PyObject *
501501
Py_VaBuildValue(const char *format, va_list va)
502502
{
503-
return va_build_value(format, va, 0);
503+
return va_build_value(format, va);
504504
}
505505

506506
PyAPI_FUNC(PyObject *) /* abi only */
507507
_Py_VaBuildValue_SizeT(const char *format, va_list va)
508508
{
509-
return va_build_value(format, va, 0);
509+
return va_build_value(format, va);
510510
}
511511

512512
static PyObject *
513-
va_build_value(const char *format, va_list va, int flags)
513+
va_build_value(const char *format, va_list va)
514514
{
515515
const char *f = format;
516516
Py_ssize_t n = countformat(f, '\0');
@@ -524,9 +524,9 @@ va_build_value(const char *format, va_list va, int flags)
524524
}
525525
va_copy(lva, va);
526526
if (n == 1) {
527-
retval = do_mkvalue(&f, &lva, flags);
527+
retval = do_mkvalue(&f, &lva);
528528
} else {
529-
retval = do_mktuple(&f, &lva, '\0', n, flags);
529+
retval = do_mktuple(&f, &lva, '\0', n);
530530
}
531531
va_end(lva);
532532
return retval;
@@ -566,7 +566,7 @@ _Py_VaBuildStack(PyObject **small_stack, Py_ssize_t small_stack_len,
566566

567567
va_copy(lva, va);
568568
f = format;
569-
res = do_mkstack(stack, &f, &lva, '\0', n, 0);
569+
res = do_mkstack(stack, &f, &lva, '\0', n);
570570
va_end(lva);
571571

572572
if (res < 0) {

0 commit comments

Comments
 (0)