Use debug_msg macro where possible

* linux/alpha/get_scno.c (arch_get_scno): Use debug_msg instead of
open-coding it.
* linux/mips/get_scno.c: Likewise.
* linux/sh/get_scno.c: Likewise.

Signed-off-by: Paul Chaignon <paul.chaignon@gmail.com>
Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>

diff --git a/linux/alpha/get_scno.c b/linux/alpha/get_scno.c
index 2d5c6d6a1971da17710d7069bd902894b8895a58..2b5e54f6c002f1dfcb225337cc49f2083daa7721 100644 (file)
--- a/linux/alpha/get_scno.c
+++ b/linux/alpha/get_scno.c
@@ -22,8 +22,7 @@ arch_get_scno(struct tcb *tcp)
         */
        if (!scno_in_range(scno)) {
                if (alpha_a3 == 0 || alpha_a3 == -1UL) {
-                       if (debug_flag)
-                               error_msg("stray syscall exit: r0 = %lu", scno);
+                       debug_msg("stray syscall exit: r0 = %lu", scno);
                        return 0;
                }
        }

diff --git a/linux/mips/get_scno.c b/linux/mips/get_scno.c
index f06fae4628398e4bd6c214ab96408138685cb540..8c9de92f1e304d21cb6ff0efa2f2b1df5f489365 100644 (file)
--- a/linux/mips/get_scno.c
+++ b/linux/mips/get_scno.c
@@ -13,9 +13,7 @@ arch_get_scno(struct tcb *tcp)
 
        if (!scno_in_range(tcp->scno)) {
                if (mips_REG_A3 == 0 || mips_REG_A3 == (uint64_t) -1) {
-                       if (debug_flag)
-                               error_msg("stray syscall exit: v0 = %ld",
-                                         tcp->scno);
+                       debug_msg("stray syscall exit: v0 = %ld", tcp->scno);
                        return 0;
                }
        }

diff --git a/linux/sh/get_scno.c b/linux/sh/get_scno.c
index b23824d5ecb1a3c0623dfe8338e4586bfa82d8c0..2f979ae53a8fabdffc1e1d480a502aa6d328196e 100644 (file)
--- a/linux/sh/get_scno.c
+++ b/linux/sh/get_scno.c
@@ -22,10 +22,9 @@ arch_get_scno(struct tcb *tcp)
                   glibc to issue bogus negative syscall numbers.  So for
                   our purposes, make strace print what it *should* have been */
                kernel_ulong_t correct_scno = (scno & 0xff);
-               if (debug_flag)
-                       error_msg("Detected glibc bug: bogus system call"
-                                 " number = %ld, correcting to %ld",
-                                 scno, correct_scno);
+               debug_msg("Detected glibc bug: bogus system call number = %ld,"
+                         " correcting to %ld",
+                         scno, correct_scno);
                scno = correct_scno;
        }