diff options
Diffstat (limited to 'erts/emulator/sys')
| -rw-r--r-- | erts/emulator/sys/common/erl_poll.c | 17 | ||||
| -rw-r--r-- | erts/emulator/sys/unix/sys.c | 17 | ||||
| -rw-r--r-- | erts/emulator/sys/unix/sys_float.c | 13 |
3 files changed, 25 insertions, 22 deletions
diff --git a/erts/emulator/sys/common/erl_poll.c b/erts/emulator/sys/common/erl_poll.c index 169d4579a2..5cca33d7eb 100644 --- a/erts/emulator/sys/common/erl_poll.c +++ b/erts/emulator/sys/common/erl_poll.c @@ -1,19 +1,19 @@ /* * %CopyrightBegin% - * - * Copyright Ericsson AB 2006-2009. All Rights Reserved. - * + * + * Copyright Ericsson AB 2006-2010. All Rights Reserved. + * * The contents of this file are subject to the Erlang Public License, * Version 1.1, (the "License"); you may not use this file except in * compliance with the License. You should have received a copy of the * Erlang Public License along with this software. If not, it can be * retrieved online at http://www.erlang.org/. - * + * * Software distributed under the License is distributed on an "AS IS" * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See * the License for the specific language governing rights and limitations * under the License. - * + * * %CopyrightEnd% */ @@ -350,6 +350,7 @@ unset_interrupted_chk(ErtsPollSet ps) #endif +void erts_silence_warn_unused_result(long unused); static void fatal_error(char *format, ...); static void fatal_error_async_signal_safe(char *error_str); @@ -2554,8 +2555,10 @@ fatal_error_async_signal_safe(char *error_str) int len = 0; while (error_str[len]) len++; - if (len) - (void) write(2, error_str, len); /* async signal safe */ + if (len) { + /* async signal safe */ + erts_silence_warn_unused_result(write(2, error_str, len)); + } } abort(); } diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c index 183525b222..31ab5d03de 100644 --- a/erts/emulator/sys/unix/sys.c +++ b/erts/emulator/sys/unix/sys.c @@ -1,19 +1,19 @@ /* * %CopyrightBegin% - * - * Copyright Ericsson AB 1996-2009. All Rights Reserved. - * + * + * Copyright Ericsson AB 1996-2010. All Rights Reserved. + * * The contents of this file are subject to the Erlang Public License, * Version 1.1, (the "License"); you may not use this file except in * compliance with the License. You should have received a copy of the * Erlang Public License along with this software. If not, it can be * retrieved online at http://www.erlang.org/. - * + * * Software distributed under the License is distributed on an "AS IS" * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See * the License for the specific language governing rights and limitations * under the License. - * + * * %CopyrightEnd% */ @@ -709,7 +709,7 @@ prepare_crash_dump(void) if (nice_val > 39) { nice_val = 39; } - nice(nice_val); + erts_silence_warn_unused_result(nice(nice_val)); } envsz = sizeof(env); @@ -2332,7 +2332,7 @@ sys_async_ready_failed(int fd, int r, int err) char buf[120]; sprintf(buf, "sys_async_ready(): Fatal error: fd=%d, r=%d, errno=%d\n", fd, r, err); - (void) write(2, buf, strlen(buf)); + erts_silence_warn_unused_result(write(2, buf, strlen(buf))); abort(); } @@ -2891,7 +2891,7 @@ smp_sig_notify(char c) char msg[] = "smp_sig_notify(): Failed to notify signal-dispatcher thread " "about received signal"; - (void) write(2, msg, sizeof(msg)); + erts_silence_warn_unused_result(write(2, msg, sizeof(msg))); abort(); } } @@ -3121,7 +3121,6 @@ erl_sys_args(int* argc, char** argv) *argc = j; } - #ifdef ERTS_TIMER_THREAD /* diff --git a/erts/emulator/sys/unix/sys_float.c b/erts/emulator/sys/unix/sys_float.c index 15da6ab45c..c59c99f65e 100644 --- a/erts/emulator/sys/unix/sys_float.c +++ b/erts/emulator/sys/unix/sys_float.c @@ -1,19 +1,19 @@ /* * %CopyrightBegin% - * - * Copyright Ericsson AB 2001-2009. All Rights Reserved. - * + * + * Copyright Ericsson AB 2001-2010. All Rights Reserved. + * * The contents of this file are subject to the Erlang Public License, * Version 1.1, (the "License"); you may not use this file except in * compliance with the License. You should have received a copy of the * Erlang Public License along with this software. If not, it can be * retrieved online at http://www.erlang.org/. - * + * * Software distributed under the License is distributed on an "AS IS" * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See * the License for the specific language governing rights and limitations * under the License. - * + * * %CopyrightEnd% */ @@ -93,7 +93,8 @@ void erts_fp_check_init_error(volatile unsigned long *fpexnp) char buf[64]; snprintf(buf, sizeof buf, "ERTS_FP_CHECK_INIT at %p: detected unhandled FPE at %p\r\n", __builtin_return_address(0), (void*)*fpexnp); - write(2, buf, strlen(buf)); + if (write(2, buf, strlen(buf)) <= 0) + erl_exit(ERTS_ABORT_EXIT, "%s", buf); *fpexnp = 0; #if defined(__i386__) || defined(__x86_64__) erts_restore_fpu(); |