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.

8 files changed, 11 insertions, 10 deletions

diff --git a/src/providers/data_provider.h b/src/providers/data_provider.h
index c666072d3..bf595472f 100644
--- a/src/providers/data_provider.h
+++ b/src/providers/data_provider.h
@@ -141,7 +141,7 @@
 
 #define DEBUG_PAM_DATA(level, pd) do { \
     if (DEBUG_IS_SET(debug_get_level(level))) pam_print_data(level, pd); \
-} while(0);
+} while(0)
 
 
 struct response_data {
diff --git a/src/providers/dp_pam_data_util.c b/src/providers/dp_pam_data_util.c
index 7aca559fe..7ac50c4e1 100644
--- a/src/providers/dp_pam_data_util.c
+++ b/src/providers/dp_pam_data_util.c
@@ -33,7 +33,7 @@
             goto failed; \
         } \
     } \
-} while(0);
+} while(0)
 
 #define PD_MEM_COPY(el, size) do { \
     if (old_pd->el != NULL) { \
@@ -43,7 +43,7 @@
             goto failed; \
         } \
     } \
-} while(0);
+} while(0)
 
 static const char *pamcmd2str(int cmd) {
     switch (cmd) {
diff --git a/src/providers/fail_over.c b/src/providers/fail_over.c
index 6b967d4db..91d981cf5 100644
--- a/src/providers/fail_over.c
+++ b/src/providers/fail_over.c
@@ -224,7 +224,8 @@ collapse_srv_lookup(struct fo_server *server)
     struct fo_server *tmp, *meta;
 
     meta = server->srv_data->meta;
-    DEBUG(4, ("Need to refresh SRV lookup for domain %s\n", meta->srv_data->dns_domain))
+    DEBUG(4, ("Need to refresh SRV lookup for domain %s\n",
+              meta->srv_data->dns_domain));
 
     if (server != meta) {
         while (server->prev && server->prev->srv_data == meta->srv_data) {
diff --git a/src/providers/ipa/ipa_hbac_common.c b/src/providers/ipa/ipa_hbac_common.c
index 2bf40042b..be34e8451 100644
--- a/src/providers/ipa/ipa_hbac_common.c
+++ b/src/providers/ipa/ipa_hbac_common.c
@@ -347,7 +347,7 @@ hbac_ctx_to_rules(TALLOC_CTX *mem_ctx,
         if (ret == EPERM) {
             goto done;
         } else if (ret != EOK) {
-            DEBUG(1, ("Could not construct rules\n"))
+            DEBUG(1, ("Could not construct rules\n"));
             goto done;
         }
     }
diff --git a/src/providers/ipa/ipa_hbac_rules.c b/src/providers/ipa/ipa_hbac_rules.c
index 43e1e4263..cc502a8fb 100644
--- a/src/providers/ipa/ipa_hbac_rules.c
+++ b/src/providers/ipa/ipa_hbac_rules.c
@@ -125,7 +125,7 @@ ipa_hbac_rule_info_send(TALLOC_CTX *mem_ctx,
     ret = sysdb_attrs_get_string_array(ipa_host, SYSDB_ORIG_MEMBEROF,
                                        tmp_ctx, &memberof_list);
     if (ret != EOK && ret != ENOENT) {
-        DEBUG(1, ("Could not identify "))
+        DEBUG(1, ("Could not identify "));
     } if (ret == ENOENT) {
         /* This host is not a member of any hostgroups */
         memberof_list = talloc_array(tmp_ctx, const char *, 1);
diff --git a/src/providers/krb5/krb5_child.c b/src/providers/krb5/krb5_child.c
index 7f6f93672..ec2251e43 100644
--- a/src/providers/krb5/krb5_child.c
+++ b/src/providers/krb5/krb5_child.c
@@ -104,7 +104,7 @@ static const char *__krb5_error_msg;
     __krb5_error_msg = sss_krb5_get_error_message(krb5_error_ctx, krb5_error); \
     DEBUG(level, ("%d: [%d][%s]\n", __LINE__, krb5_error, __krb5_error_msg)); \
     sss_krb5_free_error_message(krb5_error_ctx, __krb5_error_msg); \
-} while(0);
+} while(0)
 
 static void sss_krb5_expire_callback_func(krb5_context context, void *data,
                                           krb5_timestamp password_expiration,
diff --git a/src/providers/ldap/ldap_auth.c b/src/providers/ldap/ldap_auth.c
index 390ea8bc3..df4557938 100644
--- a/src/providers/ldap/ldap_auth.c
+++ b/src/providers/ldap/ldap_auth.c
@@ -263,7 +263,7 @@ static errno_t find_password_expiration_attributes(TALLOC_CTX *mem_ctx,
     } else if (strcasecmp(pwd_policy, PWD_POL_OPT_MIT) == 0) {
         mark = ldb_msg_find_attr_as_string(msg, SYSDB_KRBPW_LASTCHANGE, NULL);
         if (mark != NULL) {
-            DEBUG(9, ("Found Kerberos password expiration attributes.\n"))
+            DEBUG(9, ("Found Kerberos password expiration attributes.\n"));
             val = ldb_msg_find_attr_as_string(msg, SYSDB_KRBPW_EXPIRATION,
                                               NULL);
             if (val != NULL) {
@@ -285,7 +285,7 @@ static errno_t find_password_expiration_attributes(TALLOC_CTX *mem_ctx,
     } else if (strcasecmp(pwd_policy, PWD_POL_OPT_SHADOW) == 0) {
         mark = ldb_msg_find_attr_as_string(msg, SYSDB_SHADOWPW_LASTCHANGE, NULL);
         if (mark != NULL) {
-            DEBUG(9, ("Found shadow password expiration attributes.\n"))
+            DEBUG(9, ("Found shadow password expiration attributes.\n"));
             spwd = talloc_zero(mem_ctx, struct spwd);
             if (spwd == NULL) {
                 DEBUG(1, ("talloc failed.\n"));
diff --git a/src/providers/ldap/sdap_child_helpers.c b/src/providers/ldap/sdap_child_helpers.c
index d0f6caeb2..5990fc3ac 100644
--- a/src/providers/ldap/sdap_child_helpers.c
+++ b/src/providers/ldap/sdap_child_helpers.c
@@ -479,7 +479,7 @@ int setup_child(struct sdap_id_ctx *ctx)
                                                        SDAP_KRB5_KEYTAB));
 
         if (ret != EOK) {
-            DEBUG(0, ("Could not verify keytab\n"))
+            DEBUG(0, ("Could not verify keytab\n"));
             return ret;
         }