Use the do-while 0 idiom for cursor guards macro

psycopg/cursor.h

@@ -97,30 +97,41 @@ HIDDEN int psyco_curs_scrollable_set(cursorObject *self, PyObject *pyvalue);
 
 /* exception-raising macros */
 #define EXC_IF_CURS_CLOSED(self) \
+do \
     if ((self)->closed || ((self)->conn && (self)->conn->closed)) { \
         PyErr_SetString(InterfaceError, "cursor already closed"); \
-    return NULL; }
+        return NULL; } \
+while (0)
 
 #define EXC_IF_NO_TUPLES(self) \
+do \
     if ((self)->notuples && (self)->name == NULL) { \
         PyErr_SetString(ProgrammingError, "no results to fetch"); \
-    return NULL; }
+        return NULL; } \
+while (0)
 
 #define EXC_IF_NO_MARK(self) \
+do \
     if ((self)->mark != (self)->conn->mark && (self)->withhold == 0) { \
         PyErr_SetString(ProgrammingError, "named cursor isn't valid anymore"); \
-    return NULL; }
+        return NULL; } \
+while (0)
 
-#define EXC_IF_CURS_ASYNC(self, cmd) if ((self)->conn->async == 1) { \
+#define EXC_IF_CURS_ASYNC(self, cmd) \
-    PyErr_SetString(ProgrammingError, #cmd " cannot be used "        \
+do \
-    "in asynchronous mode");                                         \
+    if ((self)->conn->async == 1) { \
-    return NULL; }
+        PyErr_SetString(ProgrammingError, \
+            #cmd " cannot be used in asynchronous mode"); \
+        return NULL; } \
+while (0)
 
 #define EXC_IF_ASYNC_IN_PROGRESS(self, cmd) \
+do \
     if ((self)->conn->async_cursor != NULL) { \
-    PyErr_SetString(ProgrammingError, #cmd " cannot be used "        \
+        PyErr_SetString(ProgrammingError, \
-    "while an asynchronous query is underway");                      \
+            #cmd " cannot be used while an asynchronous query is underway"); \
-    return NULL; }
+    return NULL; } \
+while (0)
 
 #ifdef __cplusplus
 }

psycopg/cursor_type.c

@@ -1169,7 +1169,7 @@ psyco_curs_scroll(cursorObject *self, PyObject *args, PyObject *kwargs)
         char buffer[128];
 
         EXC_IF_NO_MARK(self);
-        EXC_IF_ASYNC_IN_PROGRESS(self, scroll)
+        EXC_IF_ASYNC_IN_PROGRESS(self, scroll);
         EXC_IF_TPC_PREPARED(self->conn, scroll);
 
         if (strcmp(mode, "absolute") == 0) {