From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 26 Oct 2013 02:16:10 +0000 (-0600)
Subject: Fix cbdata 'error: expression result unused' errors
X-Git-Tag: SQUID_3_5_0_1~582
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d9dd36985c7067b8543fad4bda0bdd6953433da8;p=thirdparty%2Fsquid.git

Fix cbdata 'error: expression result unused' errors

Detected by Clang.
---

diff --git a/src/cbdata.h b/src/cbdata.h
index d0b5d6aa8b..f29862180a 100644
--- a/src/cbdata.h
+++ b/src/cbdata.h
@@ -416,7 +416,7 @@ cbdata_type cbdataInternalAddType(cbdata_type type, const char *label, int size,
  *
  \param type		Type being initialized
  */
-#define CBDATA_INIT_TYPE(type)	(CBDATA_##type ?  CBDATA_UNKNOWN : (CBDATA_##type = cbdataInternalAddType(CBDATA_##type, #type, sizeof(type), NULL)))
+#define CBDATA_INIT_TYPE(type)	(CBDATA_##type ? (void)0 : (CBDATA_##type = cbdataInternalAddType(CBDATA_##type, #type, sizeof(type), NULL)))
 
 /**
  \ingroup CBDATAAPI
@@ -429,7 +429,7 @@ cbdata_type cbdataInternalAddType(cbdata_type type, const char *label, int size,
  \param type		Type being initialized
  \param free_func	The freehandler called when the last known reference to an allocated entry goes away.
  */
-#define CBDATA_INIT_TYPE_FREECB(type, free_func)	(CBDATA_##type ?  CBDATA_UNKNOWN : (CBDATA_##type = cbdataInternalAddType(CBDATA_##type, #type, sizeof(type), free_func)))
+#define CBDATA_INIT_TYPE_FREECB(type, free_func)	(CBDATA_##type ? (void)0 : (CBDATA_##type = cbdataInternalAddType(CBDATA_##type, #type, sizeof(type), free_func)))
 
 /**
  \ingroup CBDATA