aboutsummaryrefslogtreecommitdiffstats
path: root/src/firemon/interface.c
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2021-06-20 18:31:12 -0300
committerLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2021-06-27 15:23:22 -0300
commit5106b2ec404d4085cb4f741aeca9f2bdc95878a9 (patch)
tree599ad4edd21adc5eb9f89d1c801f21c6ec710739 /src/firemon/interface.c
parentgcov: fix indentation (diff)
downloadfirejail-5106b2ec404d4085cb4f741aeca9f2bdc95878a9.tar.gz
firejail-5106b2ec404d4085cb4f741aeca9f2bdc95878a9.tar.zst
firejail-5106b2ec404d4085cb4f741aeca9f2bdc95878a9.zip
gcov: use no-op functions if not enabled
Instead of wrapping every gcov function call in an ifdef. Note: The usage of `((void)0)` is based on section 7.2 of the C99 standard (N1256)[1] [2]: > 7.2 Diagnostics <assert.h> > > 1 The header <assert.h> defines the assert macro and refers to another > macro, > > NDEBUG > > which is not defined by <assert.h>. If NDEBUG is defined as a macro > name at the point in the source file where <assert.h> is included, the > assert macro is defined simply as > > #define assert(ignore) ((void)0) See also assert.h(0p) from POSIX.1-2017[3]. Note: This is a continuation of commit b408b20c7 ("gcov: fix build failure with gcc 11.1.0") / PR #4373. [1] http://www.open-std.org/JTC1/SC22/WG14/www/docs/n1256.pdf [2] https://port70.net/~nsz/c/c99/n1256.html#7.2 [3] https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/assert.h.html
Diffstat (limited to 'src/firemon/interface.c')
-rw-r--r--src/firemon/interface.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/firemon/interface.c b/src/firemon/interface.c
index 372cdee41..780e3d706 100644
--- a/src/firemon/interface.c
+++ b/src/firemon/interface.c
@@ -18,6 +18,7 @@
18 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 18 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19*/ 19*/
20#include "firemon.h" 20#include "firemon.h"
21#include "../include/gcov_wrapper.h"
21#include <sys/types.h> 22#include <sys/types.h>
22#include <sys/wait.h> 23#include <sys/wait.h>
23#include <netdb.h> 24#include <netdb.h>
@@ -33,10 +34,6 @@
33//#include <net/route.h> 34//#include <net/route.h>
34//#include <linux/if_bridge.h> 35//#include <linux/if_bridge.h>
35 36
36#ifdef HAVE_GCOV
37#include "../include/gcov_wrapper.h"
38#endif
39
40// print IP addresses for all interfaces 37// print IP addresses for all interfaces
41static void net_ifprint(void) { 38static void net_ifprint(void) {
42 uint32_t ip; 39 uint32_t ip;
@@ -149,9 +146,9 @@ static void print_sandbox(pid_t pid) {
149 if (rv) 146 if (rv)
150 return; 147 return;
151 net_ifprint(); 148 net_ifprint();
152#ifdef HAVE_GCOV 149
153 __gcov_flush(); 150 __gcov_flush();
154#endif 151
155 _exit(0); 152 _exit(0);
156 } 153 }
157 154