glebfm/strace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Mass replace error_msg("%s", "literal") -> error_msg("literal")

Browse Source 
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>
This commit is contained in:
Denys Vlasenko 2013-02-26 12:30:09 +01:00
parent 1d58fe9b3b
commit 905e8e0e2f
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
signal.c
View File

@ -913,7 +913,7 @@ sys_sigreturn(struct tcb *tcp)
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 @@ sys_sigreturn(struct tcb *tcp)
m_siginfo_t si;
sigset_t sigm;
if (ptrace(PTRACE_GETREGS, tcp->pid, (char *)&regs, 0) < 0) {
perror_msg("%s", "sigreturn: PTRACE_GETREGS");
perror_msg("sigreturn: PTRACE_GETREGS");
return 0;
}
sp = regs.regs[29];
@ -957,7 +957,7 @@ sys_sigreturn(struct tcb *tcp)
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)

16
strace.c
View File

@ -750,15 +750,15 @@ detach(struct tcb *tcp)
}
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 @@ detach(struct tcb *tcp)
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 @@ startup_attach(void)
}
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 @@ startup_attach(void)
} /* 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;
}

2
syscall.c
View File

@ -1076,7 +1076,7 @@ get_scno(struct tcb *tcp)
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;
}

6
util.c
View File

@ -808,9 +808,9 @@ umoven(struct tcb *tcp, long addr, int len, char *laddr)
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 @@ umovestr(struct tcb *tcp, long addr, int len, char *laddr)
/* 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))