diff options
| author | Brett Cannon <bcannon@gmail.com> | 2003-10-19 21:31:43 (GMT) |
|---|---|---|
| committer | Brett Cannon <bcannon@gmail.com> | 2003-10-19 21:31:43 (GMT) |
| commit | 26b3a7b82cbeff578bd76be0c6dcc4c572a523c9 (patch) | |
| tree | 4d4143a33f18a360495fc516bce3c69d96e7f326 | |
| parent | d05235ec49de1cf12316e9632a2b3d339dae04c2 (diff) | |
| download | cpython-26b3a7b82cbeff578bd76be0c6dcc4c572a523c9.zip cpython-26b3a7b82cbeff578bd76be0c6dcc4c572a523c9.tar.gz cpython-26b3a7b82cbeff578bd76be0c6dcc4c572a523c9.tar.bz2 | |
Modified the Py_RETURN_* macros by having the statements surrounded by {} in
order to prevent any unexpected surprises from someone using them in a
conditional without using curly braces (e.g., ``if (foo) Py_RETURN_TRUE``.
| -rw-r--r-- | Include/boolobject.h | 4 | ||||
| -rw-r--r-- | Include/object.h | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/Include/boolobject.h b/Include/boolobject.h index 7c4939b..aa5230a 100644 --- 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 Py_INCREF(Py_True); return Py_True; -#define Py_RETURN_FALSE Py_INCREF(Py_False); return Py_False; +#define Py_RETURN_TRUE {Py_INCREF(Py_True); return Py_True;} +#define Py_RETURN_FALSE {Py_INCREF(Py_False); return 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 8fdd4dc..1033445 100644 --- a/Include/object.h +++ b/Include/object.h @@ -634,7 +634,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 Py_INCREF(Py_None); return Py_None; +#define Py_RETURN_NONE {Py_INCREF(Py_None); return Py_None;} /* Py_NotImplemented is a singleton used to signal that an operation is @@ -155,6 +155,9 @@ Build C API ----- +- Added three new macros: Py_RETURN_NONE, Py_RETURN_TRUE, and Py_RETURN_FALSE. + Each return the singleton they mention after Py_INCREF()ing them. + - Added a new function, PyTuple_Pack(n, ...) for constructing tuples from a variable length argument list of Python objects without having to invoke the more complex machinery of Py_BuildValue(). PyTuple_Pack(3, a, b, c) |