aboutsummaryrefslogtreecommitdiffstats
path: root/erts/etc/common/heart.c
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2012-01-04 18:23:38 +0100
committerBjörn-Egil Dahlberg <[email protected]>2012-01-04 18:23:38 +0100
commitf9ca630a95e1e2adb1b225bfb69e3101678183f3 (patch)
treef40c9b82bf851b7efdb9aaa88406747f60cb4822 /erts/etc/common/heart.c
parent195be9a44f2481b9c575c8ad286f4d2278b831b3 (diff)
parentd79b413adcf4c084df30f831486ba1f1ac504c5c (diff)
downloadotp-f9ca630a95e1e2adb1b225bfb69e3101678183f3.tar.gz
otp-f9ca630a95e1e2adb1b225bfb69e3101678183f3.tar.bz2
otp-f9ca630a95e1e2adb1b225bfb69e3101678183f3.zip
Merge branch 'egil/fix-compiler-warnings' into maint
* egil/fix-compiler-warnings: erts: Use re instead of regexp in testsuite erts: Remove unused code in testsuites orber: Use modern list guard in testsuite orber: Ignore unused variable in orber_tb.erl xmerl: Ignore unused variable in xmerl_uri.erl syntax_tool: Add missing type information hipe: Suppress warnings for unused variables hipe: Add type information to cfg_info record tools: Use literal formatting in erl_memory.c asn1: Remove unused variable in asn1_erl_nif.c ei: Remove unused variable in ei_format.c erts: Add missing prototype to DRIVER_INIT runtime_tools: Fix signedness in trace_ip_drv.c to_erl: Remove compiler warnings heart: Suppress compiler warnings erts: Remove compiler warnings in inet_gethost.c erts: Remove dead code in inet_gethost.c erts: Remove dead code
Diffstat (limited to 'erts/etc/common/heart.c')
-rw-r--r--erts/etc/common/heart.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/erts/etc/common/heart.c b/erts/etc/common/heart.c
index 7a5746e630..fae4d870cc 100644
--- a/erts/etc/common/heart.c
+++ b/erts/etc/common/heart.c
@@ -685,14 +685,16 @@ do_terminate(reason)
print_error("Would reboot. Terminating.");
else {
kill_old_erlang();
- system(command);
+ /* suppress gcc warning with 'if' */
+ if(system(command));
print_error("Executed \"%s\". Terminating.",command);
}
free_env_val(command);
}
else {
kill_old_erlang();
- system((char*)&cmd[0]);
+ /* suppress gcc warning with 'if' */
+ if(system((char*)&cmd[0]));
print_error("Executed \"%s\". Terminating.",cmd);
}
}