Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f326c9b5 authored by Stephen Hines's avatar Stephen Hines
Browse files

NFC: Switch CHECK_INTERFACE to be a more friendly macro statement.

In the process of upgrading to clang r349610, an improvement to the
-Wextra-semi diagnostic now catches redundant semicolons in code.
CHECK_INTERFACE is a macro statement (currently using an if with a code
block that ends in a '}'). Since most callers are treating this as a
pseudo-function call, they terminate the macro with a semicolon. This
triggers the diagnostic, as we now have "if (...) { ... };", where the
semicolon is unnecessary.

To remedy these kinds of situations, it is better to construct macro
statements that require a semicolon to terminate them. This patch uses a
do/while wrapped around the existing statement, which is a pretty common
pattern for macro statements.

Bug: http://b/122481018
Test: m checkbuild
Change-Id: Ic2efc662f70f6b311e5d4581fb8e0eeb12a361f9
parent 47a389f2
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -124,7 +124,9 @@ public: \


#define CHECK_INTERFACE(interface, data, reply)                         \
    do {                                                                \
      if (!(data).checkInterface(this)) { return PERMISSION_DENIED; }   \
    } while (false)                                                     \


// ----------------------------------------------------------------------