Trivial tweaks to error messages
* strace.c (test_ptrace_setoptions_followfork): Use kill_save_errno
instead of kill.
(trace): Use perror_msg instead of perror.
* count.c (set_sortby): Use error_msg_and_die instead of fprintf.
* syscall.c (qualify): Likewise.
* util.c (ptrace_restart): Expand error message.
(umoven): Likewise.
(umovestr): Likewise.
(upeek): Use perror_msg instead of sprintf + perror.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
diff --git a/strace.c b/strace.c
index 9b026e3..d774611 100644
--- a/strace.c
+++ b/strace.c
@@ -775,7 +775,7 @@
if (ptrace(PTRACE_TRACEME, 0L, 0L, 0L) < 0)
perror_msg_and_die("%s: PTRACE_TRACEME doesn't work",
__func__);
- kill(pid, SIGSTOP);
+ kill_save_errno(pid, SIGSTOP);
if (fork() < 0)
perror_msg_and_die("fork");
_exit(0);
@@ -789,7 +789,7 @@
if (tracee_pid <= 0) {
if (errno == EINTR)
continue;
- else if (errno == ECHILD)
+ if (errno == ECHILD)
break;
kill_save_errno(pid, SIGKILL);
perror_msg_and_die("%s: unexpected wait result %d",
@@ -813,7 +813,7 @@
if (!WIFSTOPPED(status)) {
if (tracee_pid != pid)
kill_save_errno(tracee_pid, SIGKILL);
- kill(pid, SIGKILL);
+ kill_save_errno(pid, SIGKILL);
error_msg_and_die("%s: unexpected wait status %x",
__func__, status);
}
@@ -1655,7 +1655,7 @@
return 0;
default:
errno = wait_errno;
- perror("strace: wait");
+ perror_msg("wait");
return -1;
}
}