From: Tom Yu <tlyu@mit.edu>
Date: Tue, 17 Nov 2009 01:21:31 +0000 (+0000)
Subject: Rework using "do { } while (0)" in macro bodies to avoid divergent
X-Git-Tag: krb5-1.8-alpha1~175
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a4f4d8e5755043feac052cf9dd13bec42414f871;p=krb5.git

Rework using "do { } while (0)" in macro bodies to avoid divergent
emacs-22 vs emacs-23 indentation.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23252 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/include/pkinit_apple_utils.h b/src/include/pkinit_apple_utils.h
index 421da207b..be6a930fc 100644
--- a/src/include/pkinit_apple_utils.h
+++ b/src/include/pkinit_apple_utils.h
@@ -113,12 +113,16 @@ krb5_error_code pkiCfDataToKrb5Data(
  * Non-mallocing conversion between CSSM_DATA and krb5_data
  */
 #define PKI_CSSM_TO_KRB_DATA(cd, kd)            \
-    (kd)->data = (char *)(cd)->Data;            \
-    (kd)->length = (cd)->Length;
+    do {                                        \
+        (kd)->data = (char *)(cd)->Data;        \
+        (kd)->length = (cd)->Length;            \
+    } while (0)
 
 #define PKI_KRB_TO_CSSM_DATA(kd, cd)            \
-    (cd)->Data = (uint8 *)(kd)->data;           \
-    (cd)->Length = (kd)->length;
+    do {                                        \
+        (cd)->Data = (uint8 *)(kd)->data;       \
+        (cd)->Length = (kd)->length;            \
+    } while (0)
 
 /*
  * Compare to CSSM_DATAs. Return TRUE if they're the same else FALSE.