Skip to content

Commit e266e42

Browse files
Yhg1sYhg1s
committed
Addendum to previous change: now that 'f' is not unconditionally
initialized in the 'if (..)', do so manually.
1 parent bf6cfa5 commit e266e42

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

‎Objects/abstract.c‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ PyNumber_Or(PyObject *v, PyObject *w)
291291
BINOP(v, w, "__or__", "__ror__", PyNumber_Or);
292292
if (v->ob_type->tp_as_number != NULL) {
293293
PyObject *x = NULL;
294-
PyObject * (*f)(PyObject *, PyObject *);
294+
PyObject * (*f)(PyObject *, PyObject *) = NULL;
295295
if (PyNumber_Coerce(&v, &w) != 0)
296296
return NULL;
297297
if (v->ob_type->tp_as_number != NULL &&
@@ -311,7 +311,7 @@ PyNumber_Xor(PyObject *v, PyObject *w)
311311
BINOP(v, w, "__xor__", "__rxor__", PyNumber_Xor);
312312
if (v->ob_type->tp_as_number != NULL) {
313313
PyObject *x = NULL;
314-
PyObject * (*f)(PyObject *, PyObject *);
314+
PyObject * (*f)(PyObject *, PyObject *) = NULL;
315315
if (PyNumber_Coerce(&v, &w) != 0)
316316
return NULL;
317317
if (v->ob_type->tp_as_number != NULL &&
@@ -331,7 +331,7 @@ PyNumber_And(PyObject *v, PyObject *w)
331331
BINOP(v, w, "__and__", "__rand__", PyNumber_And);
332332
if (v->ob_type->tp_as_number != NULL) {
333333
PyObject *x = NULL;
334-
PyObject * (*f)(PyObject *, PyObject *);
334+
PyObject * (*f)(PyObject *, PyObject *) = NULL;
335335
if (PyNumber_Coerce(&v, &w) != 0)
336336
return NULL;
337337
if (v->ob_type->tp_as_number != NULL &&
@@ -351,7 +351,7 @@ PyNumber_Lshift(PyObject *v, PyObject *w)
351351
BINOP(v, w, "__lshift__", "__rlshift__", PyNumber_Lshift);
352352
if (v->ob_type->tp_as_number != NULL) {
353353
PyObject *x = NULL;
354-
PyObject * (*f)(PyObject *, PyObject *);
354+
PyObject * (*f)(PyObject *, PyObject *) = NULL;
355355
if (PyNumber_Coerce(&v, &w) != 0)
356356
return NULL;
357357
if (v->ob_type->tp_as_number != NULL &&
@@ -371,7 +371,7 @@ PyNumber_Rshift(PyObject *v, PyObject *w)
371371
BINOP(v, w, "__rshift__", "__rrshift__", PyNumber_Rshift);
372372
if (v->ob_type->tp_as_number != NULL) {
373373
PyObject *x = NULL;
374-
PyObject * (*f)(PyObject *, PyObject *);
374+
PyObject * (*f)(PyObject *, PyObject *) = NULL;
375375
if (PyNumber_Coerce(&v, &w) != 0)
376376
return NULL;
377377
if (v->ob_type->tp_as_number != NULL &&
@@ -396,7 +396,7 @@ PyNumber_Add(PyObject *v, PyObject *w)
396396
return (*m->sq_concat)(v, w);
397397
else if (v->ob_type->tp_as_number != NULL) {
398398
PyObject *x = NULL;
399-
PyObject * (*f)(PyObject *, PyObject *);
399+
PyObject * (*f)(PyObject *, PyObject *) = NULL;
400400
if (PyNumber_Coerce(&v, &w) != 0)
401401
return NULL;
402402
if (v->ob_type->tp_as_number != NULL &&
@@ -416,7 +416,7 @@ PyNumber_Subtract(PyObject *v, PyObject *w)
416416
BINOP(v, w, "__sub__", "__rsub__", PyNumber_Subtract);
417417
if (v->ob_type->tp_as_number != NULL) {
418418
PyObject *x = NULL;
419-
PyObject * (*f)(PyObject *, PyObject *);
419+
PyObject * (*f)(PyObject *, PyObject *) = NULL;
420420
if (PyNumber_Coerce(&v, &w) != 0)
421421
return NULL;
422422
if (v->ob_type->tp_as_number != NULL &&
@@ -447,7 +447,7 @@ PyNumber_Multiply(PyObject *v, PyObject *w)
447447
}
448448
if (tp->tp_as_number != NULL) {
449449
PyObject *x = NULL;
450-
PyObject * (*f)(PyObject *, PyObject *);
450+
PyObject * (*f)(PyObject *, PyObject *) = NULL;
451451
if (PyNumber_Coerce(&v, &w) != 0)
452452
return NULL;
453453
if (v->ob_type->tp_as_number != NULL &&
@@ -485,7 +485,7 @@ PyNumber_Divide(PyObject *v, PyObject *w)
485485
BINOP(v, w, "__div__", "__rdiv__", PyNumber_Divide);
486486
if (v->ob_type->tp_as_number != NULL) {
487487
PyObject *x = NULL;
488-
PyObject * (*f)(PyObject *, PyObject *);
488+
PyObject * (*f)(PyObject *, PyObject *) = NULL;
489489
if (PyNumber_Coerce(&v, &w) != 0)
490490
return NULL;
491491
if (v->ob_type->tp_as_number != NULL &&
@@ -509,7 +509,7 @@ PyNumber_Remainder(PyObject *v, PyObject *w)
509509
BINOP(v, w, "__mod__", "__rmod__", PyNumber_Remainder);
510510
if (v->ob_type->tp_as_number != NULL) {
511511
PyObject *x = NULL;
512-
PyObject * (*f)(PyObject *, PyObject *);
512+
PyObject * (*f)(PyObject *, PyObject *) = NULL;
513513
if (PyNumber_Coerce(&v, &w) != 0)
514514
return NULL;
515515
if (v->ob_type->tp_as_number != NULL &&
@@ -529,7 +529,7 @@ PyNumber_Divmod(PyObject *v, PyObject *w)
529529
BINOP(v, w, "__divmod__", "__rdivmod__", PyNumber_Divmod);
530530
if (v->ob_type->tp_as_number != NULL) {
531531
PyObject *x = NULL;
532-
PyObject * (*f)(PyObject *, PyObject *);
532+
PyObject * (*f)(PyObject *, PyObject *) = NULL;
533533
if (PyNumber_Coerce(&v, &w) != 0)
534534
return NULL;
535535
if (v->ob_type->tp_as_number != NULL &&

0 commit comments

Comments
 (0)