From f52cd8cdd84ce53129ed4ab610b04d7503cd8208 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Mon, 15 Mar 2010 00:31:16 +0000 Subject: [PATCH] * linux-low.c (fetch_register): Avoid passing a non string literal format to `error'. (usr_store_inferior_registers): Ditto. --- gdb/gdbserver/ChangeLog | 6 ++++++ gdb/gdbserver/linux-low.c | 21 ++------------------- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index b8c26faf060..229cceaf0ba 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,9 @@ +2010-03-15 Pedro Alves + + * linux-low.c (fetch_register): Avoid passing a non string literal + format to `error'. + (usr_store_inferior_registers): Ditto. + 2010-03-14 Pedro Alves * linux-low.c (linux_write_memory): Bail out early if peeking diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c index 1b344844bb1..4ccadbc3759 100644 --- a/gdb/gdbserver/linux-low.c +++ b/gdb/gdbserver/linux-low.c @@ -2217,23 +2217,13 @@ fetch_register (struct regcache *regcache, int regno) (PTRACE_ARG3_TYPE) (uintptr_t) regaddr, 0); regaddr += sizeof (PTRACE_XFER_TYPE); if (errno != 0) - { - /* Warning, not error, in case we are attached; sometimes the - kernel doesn't let us at the registers. */ - char *err = strerror (errno); - char *msg = alloca (strlen (err) + 128); - sprintf (msg, "reading register %d: %s", regno, err); - error (msg); - goto error_exit; - } + error ("reading register %d: %s", regno, strerror (errno)); } if (the_low_target.supply_ptrace_register) the_low_target.supply_ptrace_register (regcache, regno, buf); else supply_register (regcache, regno, buf); - -error_exit:; } /* Fetch all registers, or just one, from the child process. */ @@ -2299,14 +2289,7 @@ usr_store_inferior_registers (struct regcache *regcache, int regno) return; if ((*the_low_target.cannot_store_register) (regno) == 0) - { - char *err = strerror (errno); - char *msg = alloca (strlen (err) + 128); - sprintf (msg, "writing register %d: %s", - regno, err); - error (msg); - return; - } + error ("writing register %d: %s", regno, strerror (errno)); } regaddr += sizeof (PTRACE_XFER_TYPE); } -- 2.30.2