SF bug 994255: Py_RETURN_NONE causes too much warnings

Rewrote Py_RETURN_{NONE, TRUE, FALSE} to expand to comma expressions
rather than "do {} while(0)" thingies.  The OP complained because he
likes using MS /W4 sometimes, and then all his uses of these things
generate nuisance warnings about testing a constant expression (in
the "while(0)" part).  Comma expressions don't have this problem
(although it's a lucky accident that comma expressions suffice for these
macros!).

diff --git a/Include/boolobject.h b/Include/boolobject.h
index 92d5e27ab4390a7b61c1874fe0380f2fa984f4b7..7f9ad01a05193ab536b42cee64577a2b26048677 100644 (file)
--- a/Include/boolobject.h
+++ b/Include/boolobject.h
@@ -24,8 +24,8 @@ PyAPI_DATA(PyIntObject) _Py_ZeroStruct, _Py_TrueStruct;
 #define Py_True ((PyObject *) &_Py_TrueStruct)
 
 /* Macros for returning Py_True or Py_False, respectively */
-#define Py_RETURN_TRUE do {Py_INCREF(Py_True); return Py_True;} while (0)
-#define Py_RETURN_FALSE do {Py_INCREF(Py_False); return Py_False;} while (0)
+#define Py_RETURN_TRUE return Py_INCREF(Py_True), Py_True
+#define Py_RETURN_FALSE return Py_INCREF(Py_False), Py_False
 
 /* Function to return a bool from a C long */
 PyAPI_FUNC(PyObject *) PyBool_FromLong(long);

diff --git a/Include/object.h b/Include/object.h
index 60cf1464fa04823c9f656be9fd79f0cedd90f013..5db4dac06109e80abf974e0f43f0bf81390f9501 100644 (file)
--- a/Include/object.h
+++ b/Include/object.h
@@ -650,7 +650,7 @@ PyAPI_DATA(PyObject) _Py_NoneStruct; /* Don't use this directly */
 #define Py_None (&_Py_NoneStruct)
 
 /* Macro for returning Py_None from a function */
-#define Py_RETURN_NONE do {Py_INCREF(Py_None); return Py_None;} while (0)
+#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
 
 /*
 Py_NotImplemented is a singleton used to signal that an operation is