Stackless issue python#140: Fix compiler warnings

Anselm Kruis · Anselm Kruis · commit c51072ea1428 · 2017-11-06T19:51:41.000+01:00
Fix warnings emitted by gcc 7.2.
- ceval.c: '*' in boolean context, suggest '&amp;&amp;' instead.
- stacklessmodule.c: a misleading indentation
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -3998,7 +3998,7 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
     /* Set f->f_lasti to the instruction before the current one or to the
      * first instruction (-1). See "f->f_lasti refers to ..." above.
      */
-    f->f_lasti = INSTR_OFFSET() ?
+    f->f_lasti = INSTR_OFFSET() != 0 ?
             assert(INSTR_OFFSET() >= sizeof(_Py_CODEUNIT)),
             (int)(INSTR_OFFSET() - sizeof(_Py_CODEUNIT)) : -1;
     if (SLP_PEEK_NEXT_FRAME(tstate)->f_back != f)
@@ -4049,7 +4049,7 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
     /* Set f->f_lasti to the instruction before the current one or to the
      * first instruction (-1). See "f->f_lasti refers to ..." above.
      */
-    f->f_lasti = INSTR_OFFSET() ?
+    f->f_lasti = INSTR_OFFSET() != 0 ?
             assert(INSTR_OFFSET() >= sizeof(_Py_CODEUNIT)),
             (int)(INSTR_OFFSET() - sizeof(_Py_CODEUNIT)) : -1;
     return (PyObject *) Py_UnwindToken;
diff --git a/Stackless/module/stacklessmodule.c b/Stackless/module/stacklessmodule.c
@@ -871,10 +871,9 @@ test_cframe(PyObject *self, PyObject *args, PyObject *kwds)
     if (!PyArg_ParseTupleAndKeywords(args, kwds, "l|l:test_cframe",
                                      argnames, &switches, &extra))
         return NULL;
-        if (extra < 0 || extra > STACK_MAX_USEFUL)
-            VALUE_ERROR(
-                "test_cframe: words are limited by 0 and " \
-                STACK_MAX_USESTR, NULL);
+    if (extra < 0 || extra > STACK_MAX_USEFUL)
+        VALUE_ERROR("test_cframe: words are limited by 0 and " \
+                    STACK_MAX_USESTR, NULL);
     if (extra > 0)
         alloca(extra*sizeof(PyObject*));
     Py_INCREF(ret);
