Change in ...libosmocore[master]: Revert "utils.h: require a semi colon after OSMO_ASSERT"

laforge gerrit-no-reply at lists.osmocom.org
Tue Jul 9 09:37:03 UTC 2019


laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libosmocore/+/14703 )

Change subject: Revert "utils.h: require a semi colon after OSMO_ASSERT"
......................................................................

Revert "utils.h: require a semi colon after OSMO_ASSERT"

This reverts commit 4e284b637943980a405a8c44f2712b749ded428f.

Unfortunately, some projects such as OsmoMSC, OsmoBTS and OpenBSC
do contain OSMO_ASSERT statements without a semi colon. Thus,
this change causes compilation errors when building them.

Please note that only the OSMO_ASSERT's definition is reverted,
while changes to other files (adding missing semicolons) are kept.

Change-Id: I6da4d7397d993f6c1af658cb5ae1e49c92a1b350
---
M include/osmocom/core/utils.h
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Jenkins Builder: Verified
  osmith: Looks good to me, approved



diff --git a/include/osmocom/core/utils.h b/include/osmocom/core/utils.h
index 8585a6a..601bb56 100644
--- a/include/osmocom/core/utils.h
+++ b/include/osmocom/core/utils.h
@@ -98,9 +98,9 @@
  *  the predicate evaluates to false (0).
  */
 #define OSMO_ASSERT(exp)    \
-	do if (!(exp)) { \
+	if (!(exp)) { \
 		osmo_panic("Assert failed %s %s:%d\n", #exp, __FILE__, __LINE__); \
-	} while(0)
+	}
 
 /*! duplicate a string using talloc and release its prior content (if any)
  * \param[in] ctx Talloc context to use for allocation

-- 
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/14703
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I6da4d7397d993f6c1af658cb5ae1e49c92a1b350
Gerrit-Change-Number: 14703
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <axilirator at gmail.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at gnumonks.org>
Gerrit-Reviewer: lynxis lazus <lynxis at fe80.eu>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190709/0f87a779/attachment.html>


More information about the gerrit-log mailing list