ICElibint.h: add do ... while (0) around macro definitions

Clears 71 warnings from clang 13 of the form:

connect.c:351:39: warning: empty expression statement has no effect;
 remove unnecessary ';' to silence this warning [-Wextra-semi-stmt]
        STORE_STRING (pData, IceVendorString);
                                             ^

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/lib/libice/-/merge_requests/23>

1 files changed, 24 insertions, 24 deletions

diff --git a/src/ICElibint.h b/src/ICElibint.h
index 823db6a..24d8452 100644
--- a/src/ICElibint.h
+++ b/src/ICElibint.h
@@ -156,40 +156,40 @@ typedef struct {
  */
 
 #define STORE_CARD8(_pBuf, _val) \
-{ \
+do { \
     *((CARD8 *) _pBuf) = _val; \
     _pBuf += 1; \
-}
+} while (0)
 
 #define STORE_CARD16(_pBuf, _val) \
-{ \
+do { \
     *((CARD16 *) _pBuf) = _val; \
     _pBuf += 2; \
-}
+} while (0)
 
 #define STORE_CARD32(_pBuf, _val) \
-{ \
+do { \
     *((CARD32 *) _pBuf) = _val; \
     _pBuf += 4; \
-}
+} while (0)
 
 
 #define STORE_STRING(_pBuf, _string) \
-{ \
+do { \
     CARD16 _len = (CARD16) strlen (_string); \
     STORE_CARD16 (_pBuf, _len); \
     memcpy (_pBuf, _string, _len); \
     _pBuf += _len; \
     if (PAD32 (2 + _len)) \
         _pBuf += PAD32 (2 + _len); \
-}
+} while (0)
 
 
 /*
  * SEND FOO - write to connection instead of buffer
  */
 #define SEND_STRING(_iceConn, _string) \
-{ \
+do { \
     char _padding[3] = { 0 }; \
     CARD16 _len = (CARD16) strlen (_string); \
     IceWriteData32 (_iceConn, 2, &_len); \
@@ -197,37 +197,37 @@ typedef struct {
         IceSendData (_iceConn, _len, (char *) _string);  \
     if (PAD32 (2 + _len)) \
         IceSendData (_iceConn, PAD32 (2 + _len), _padding); \
-}
+} while (0)
 
 /*
  * EXTRACT FOO
  */
 
 #define EXTRACT_CARD8(_pBuf, _val) \
-{ \
+do { \
     _val = *((CARD8 *) _pBuf); \
     _pBuf += 1; \
-}
+} while (0)
 
 #define EXTRACT_CARD16(_pBuf, _swap, _val) \
-{ \
+do { \
     _val = *((CARD16 *) _pBuf); \
     _pBuf += 2; \
     if (_swap) \
         _val = lswaps (_val); \
-}
+} while (0)
 
 #define EXTRACT_CARD32(_pBuf, _swap, _val) \
-{ \
+do { \
     _val = *((CARD32 *) _pBuf); \
     _pBuf += 4; \
     if (_swap) \
         _val = lswapl (_val); \
-}
+} while (0)
 
 
 #define EXTRACT_STRING(_pBuf, _swap, _string) \
-{ \
+do { \
     CARD16 _len; \
     EXTRACT_CARD16 (_pBuf, _swap, _len); \
     _string = malloc (_len + 1); \
@@ -238,32 +238,32 @@ typedef struct {
     _pBuf += _len; \
     if (PAD32 (2 + _len)) \
         _pBuf += PAD32 (2 + _len); \
-}
+} while (0)
 
 #define EXTRACT_LISTOF_STRING(_pBuf, _swap, _count, _strings) \
-{ \
+do { \
     int _i; \
     for (_i = 0; _i < _count; _i++) \
         EXTRACT_STRING (_pBuf, _swap, _strings[_i]); \
-}
+} while (0)
 
 
 #define SKIP_STRING(_pBuf, _swap, _end, _bail) \
-{ \
+do { \
     CARD16 _len; \
     EXTRACT_CARD16 (_pBuf, _swap, _len); \
     _pBuf += _len + PAD32(2+_len); \
     if (_pBuf > _end) { \
 	_bail; \
     } \
-}
+} while (0)
 
 #define SKIP_LISTOF_STRING(_pBuf, _swap, _count, _end, _bail) \
-{ \
+do { \
     int _i; \
     for (_i = 0; _i < _count; _i++) \
         SKIP_STRING (_pBuf, _swap, _end, _bail); \
-}
+} while (0)