From 4a6a5421113ab662a665c62ed6a24b61a5a36950 Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek@redhat.com>
Date: Fri, 23 Sep 2011 08:47:53 +0200
Subject: Multiline macro cleanup

This is mostly a cosmetic patch.

The purpose of wrapping a multi-line macro in a do { } while(0) is to
make the macro usable as a regular statement, not a compound statement.

When the while(0) is terminated with a semicolon, the do { } while(0);
block becomes a compound statement again.
---
 src/util/crypto/nss/nss_obfuscate.c | 2 +-
 src/util/sss_python.h               | 4 ++--
 src/util/util.h                     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/util')

diff --git a/src/util/crypto/nss/nss_obfuscate.c b/src/util/crypto/nss/nss_obfuscate.c
index cbd8984a..54cec099 100644
--- a/src/util/crypto/nss/nss_obfuscate.c
+++ b/src/util/crypto/nss/nss_obfuscate.c
@@ -49,7 +49,7 @@
     (sitem)->type = (siBuffer); \
     (sitem)->data = (sdata);    \
     (sitem)->len  = (slen);     \
-} while(0);
+} while(0)
 
 struct sss_nss_crypto_ctx {
     PK11SlotInfo *slot;
diff --git a/src/util/sss_python.h b/src/util/sss_python.h
index 135c2877..8f81bf91 100644
--- a/src/util/sss_python.h
+++ b/src/util/sss_python.h
@@ -50,7 +50,7 @@ sss_exception_with_doc(char *name, char *doc, PyObject *base, PyObject *dict);
     PyModule_AddObject(module,                      \
                        discard_const_p(char, name), \
                        (PyObject *) &type);         \
-} while(0);                                         \
+} while(0)                                          \
 
 #define SAFE_SET(old, new) do {         \
     PyObject *__simple_set_tmp = NULL;  \
@@ -58,6 +58,6 @@ sss_exception_with_doc(char *name, char *doc, PyObject *base, PyObject *dict);
     Py_INCREF(new);                     \
     old = new;                          \
     Py_XDECREF(__simple_set_tmp);       \
-} while(0);
+} while(0)
 
 #endif /* __SSS_PYTHON_H__ */
diff --git a/src/util/util.h b/src/util/util.h
index 118d70c5..6cc8a546 100644
--- a/src/util/util.h
+++ b/src/util/util.h
@@ -139,7 +139,7 @@ errno_t set_debug_file_from_fd(const int fd);
         } \
         debug_fn body; \
     } \
-} while(0);
+} while(0)
 
 /** \def DEBUG_MSG(level, function, message)
     \brief macro to generate debug messages with message from variable
@@ -180,7 +180,7 @@ errno_t set_debug_file_from_fd(const int fd);
                      debug_prg_name, function, __debug_macro_newlevel, message); \
         } \
     } \
-} while(0);
+} while(0)
 
 /** \def DEBUG_IS_SET(level)
     \brief checks whether level (must be in new format) is set in debug_level
-- 
cgit