commit 050b0a6fd01fc01952c0ab8dbb84d6eba65c71c9
author Petr Machata <pmachata@redhat.com> Tue Apr 03 01:30:30 2012 +0200
committer Petr Machata <pmachata@redhat.com> Thu Apr 19 01:35:45 2012 +0200
tree 70e1db1329c3342d494fcadf815fdf4862877f19
parent 949a56a0e1d4a13dc437621a991e993d6623aef5

Coding style

sysdeps/linux-gnu/breakpoint.c

diff --git a/sysdeps/linux-gnu/breakpoint.c b/sysdeps/linux-gnu/breakpoint.c
index acf5932..c026aa7 100644
--- a/sysdeps/linux-gnu/breakpoint.c
+++ b/sysdeps/linux-gnu/breakpoint.c
@@ -20,11 +20,8 @@
 	static unsigned char break_insn[] = BREAKPOINT_VALUE;
 	unsigned int i, j;
 
-	if (sbp->libsym) {
-		debug(DEBUG_PROCESS, "enable_breakpoint: pid=%d, addr=%p, symbol=%s", pid, sbp->addr, sbp->libsym->name);
-	} else {
-		debug(DEBUG_PROCESS, "enable_breakpoint: pid=%d, addr=%p", pid, sbp->addr);
-	}
+	debug(DEBUG_PROCESS, "enable_breakpoint: pid=%d, addr=%p, symbol=%s",
+	      pid, sbp->addr, breakpoint_name(sbp));
 
 	for (i = 0; i < 1 + ((BREAKPOINT_LENGTH - 1) / sizeof(long)); i++) {
 		long a = ptrace(PTRACE_PEEKTEXT, pid,
@@ -56,11 +53,8 @@
 void
 enable_breakpoint(Process *proc, struct breakpoint *sbp)
 {
-	if (sbp->libsym) {
-		debug(DEBUG_PROCESS, "enable_breakpoint: pid=%d, addr=%p, symbol=%s", proc->pid, sbp->addr, sbp->libsym->name);
-	} else {
-		debug(DEBUG_PROCESS, "enable_breakpoint: pid=%d, addr=%p", proc->pid, sbp->addr);
-	}
+	debug(DEBUG_PROCESS, "enable_breakpoint: pid=%d, addr=%p, symbol=%s",
+	      proc->pid, sbp->addr, breakpoint_name(sbp));
 	arch_enable_breakpoint(proc->pid, sbp);
 }
 
@@ -72,11 +66,8 @@
 {
 	unsigned int i, j;
 
-	if (sbp->libsym) {
-		debug(DEBUG_PROCESS, "disable_breakpoint: pid=%d, addr=%p, symbol=%s", pid, sbp->addr, sbp->libsym->name);
-	} else {
-		debug(DEBUG_PROCESS, "disable_breakpoint: pid=%d, addr=%p", pid, sbp->addr);
-	}
+	debug(DEBUG_PROCESS, "disable_breakpoint: pid=%d, addr=%p, symbol=%s",
+	      pid, sbp->addr, breakpoint_name(sbp));
 
 	for (i = 0; i < 1 + ((BREAKPOINT_LENGTH - 1) / sizeof(long)); i++) {
 		long a = ptrace(PTRACE_PEEKTEXT, pid,
@@ -107,10 +98,7 @@
 void
 disable_breakpoint(Process *proc, struct breakpoint *sbp)
 {
-	if (sbp->libsym) {
-		debug(DEBUG_PROCESS, "disable_breakpoint: pid=%d, addr=%p, symbol=%s", proc->pid, sbp->addr, sbp->libsym->name);
-	} else {
-		debug(DEBUG_PROCESS, "disable_breakpoint: pid=%d, addr=%p", proc->pid, sbp->addr);
-	}
+	debug(DEBUG_PROCESS, "disable_breakpoint: pid=%d, addr=%p, symbol=%s",
+	      proc->pid, sbp->addr, breakpoint_name(sbp));
 	arch_disable_breakpoint(proc->pid, sbp);
 }