Mass replace error_msg("%s", "literal") -> error_msg("literal")
There is no need to print literal strings through "%s".
Only untrusted strings such as filenames need that.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
diff --git a/signal.c b/signal.c
index 227b149..8873c74 100644
--- a/signal.c
+++ b/signal.c
@@ -913,7 +913,7 @@
sigset_t sigm;
i1 = sparc_regs.u_regs[U_REG_O1];
if (umove(tcp, i1, &si) < 0) {
- perror_msg("%s", "sigreturn: umove");
+ perror_msg("sigreturn: umove");
return 0;
}
long_to_sigset(si.si_mask, &sigm);
@@ -942,7 +942,7 @@
m_siginfo_t si;
sigset_t sigm;
if (ptrace(PTRACE_GETREGS, tcp->pid, (char *)®s, 0) < 0) {
- perror_msg("%s", "sigreturn: PTRACE_GETREGS");
+ perror_msg("sigreturn: PTRACE_GETREGS");
return 0;
}
sp = regs.regs[29];
@@ -957,7 +957,7 @@
long regs[PT_MAX+1];
sigset_t sigm;
if (ptrace(PTRACE_GETREGS, tcp->pid, NULL, (long)regs) < 0) {
- perror_msg("%s", "sigreturn: PTRACE_GETREGS");
+ perror_msg("sigreturn: PTRACE_GETREGS");
return 0;
}
if (umove(tcp, regs[PT_USP], &sc) < 0)
diff --git a/strace.c b/strace.c
index de5b08a..4975153 100644
--- a/strace.c
+++ b/strace.c
@@ -750,15 +750,15 @@
}
else if (errno != ESRCH) {
/* Shouldn't happen. */
- perror_msg("%s", "detach: ptrace(PTRACE_DETACH, ...)");
+ perror_msg("detach: ptrace(PTRACE_DETACH, ...)");
}
else if (my_tkill(tcp->pid, 0) < 0) {
if (errno != ESRCH)
- perror_msg("%s", "detach: checking sanity");
+ perror_msg("detach: checking sanity");
}
else if (!sigstop_expected && my_tkill(tcp->pid, SIGSTOP) < 0) {
if (errno != ESRCH)
- perror_msg("%s", "detach: stopping child");
+ perror_msg("detach: stopping child");
}
else
sigstop_expected = 1;
@@ -771,21 +771,21 @@
if (errno == ECHILD) /* Already gone. */
break;
if (errno != EINVAL) {
- perror_msg("%s", "detach: waiting");
+ perror_msg("detach: waiting");
break;
}
#endif /* __WALL */
/* No __WALL here. */
if (waitpid(tcp->pid, &status, 0) < 0) {
if (errno != ECHILD) {
- perror_msg("%s", "detach: waiting");
+ perror_msg("detach: waiting");
break;
}
#ifdef __WCLONE
/* If no processes, try clones. */
if (waitpid(tcp->pid, &status, __WCLONE) < 0) {
if (errno != ECHILD)
- perror_msg("%s", "detach: waiting");
+ perror_msg("detach: waiting");
break;
}
#endif /* __WCLONE */
@@ -934,7 +934,7 @@
}
ntid -= nerr;
if (ntid == 0) {
- perror_msg("%s", "attach: ptrace(PTRACE_ATTACH, ...)");
+ perror_msg("attach: ptrace(PTRACE_ATTACH, ...)");
droptcb(tcp);
continue;
}
@@ -955,7 +955,7 @@
} /* if (opendir worked) */
} /* if (-f) */
if (ptrace_attach_or_seize(tcp->pid) < 0) {
- perror_msg("%s", "attach: ptrace(PTRACE_ATTACH, ...)");
+ perror_msg("attach: ptrace(PTRACE_ATTACH, ...)");
droptcb(tcp);
continue;
}
diff --git a/syscall.c b/syscall.c
index 120b19b..5bf2a12 100644
--- a/syscall.c
+++ b/syscall.c
@@ -1076,7 +1076,7 @@
errno = 0;
opcode = ptrace(PTRACE_PEEKTEXT, tcp->pid, (char *)(psw - sizeof(long)), 0);
if (errno) {
- perror_msg("%s", "peektext(psw-oneword)");
+ perror_msg("peektext(psw-oneword)");
return -1;
}
diff --git a/util.c b/util.c
index 88798c0..354efef 100644
--- a/util.c
+++ b/util.c
@@ -808,9 +808,9 @@
else if (errno != EINVAL && errno != ESRCH)
/* EINVAL or ESRCH could be seen if process is gone,
* all the rest is strange and should be reported. */
- perror_msg("%s", "process_vm_readv");
+ perror_msg("process_vm_readv");
} else {
- perror_msg("process_vm_readv: short read (%d < %d)", r, len);
+ error_msg("process_vm_readv: short read (%d < %d)", r, len);
}
}
@@ -923,7 +923,7 @@
/* EINVAL or ESRCH could be seen
* if process is gone, all the rest
* is strange and should be reported. */
- perror_msg("%s", "process_vm_readv");
+ perror_msg("process_vm_readv");
goto vm_readv_didnt_work;
}
if (memchr(local[0].iov_base, '\0', r))