Module Name: src Committed By: maxv Date: Tue Apr 15 17:53:09 UTC 2014
Modified Files: src/sys/compat/linux/arch/i386: linux_ptrace.c src/sys/compat/linux/arch/powerpc: linux_ptrace.c Log Message: There are two times the same branches. } else if (addr == LUSR_OFF(__signal)) { error = ENOTSUP; } else if (addr == LUSR_OFF(__signal)) { error = ENOTSUP; } Just delete one of them. Spotted by my code scanner. ok christos@ To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/compat/linux/arch/i386/linux_ptrace.c cvs rdiff -u -r1.24 -r1.25 src/sys/compat/linux/arch/powerpc/linux_ptrace.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/compat/linux/arch/i386/linux_ptrace.c diff -u src/sys/compat/linux/arch/i386/linux_ptrace.c:1.27 src/sys/compat/linux/arch/i386/linux_ptrace.c:1.28 --- src/sys/compat/linux/arch/i386/linux_ptrace.c:1.27 Sat Jan 4 00:10:03 2014 +++ src/sys/compat/linux/arch/i386/linux_ptrace.c Tue Apr 15 17:53:09 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_ptrace.c,v 1.27 2014/01/04 00:10:03 dsl Exp $ */ +/* $NetBSD: linux_ptrace.c,v 1.28 2014/04/15 17:53:09 maxv Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.27 2014/01/04 00:10:03 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.28 2014/04/15 17:53:09 maxv Exp $"); #include <sys/param.h> #include <sys/malloc.h> @@ -323,8 +323,6 @@ linux_sys_ptrace_arch(struct lwp *l, con *retval = led->led_debugreg[off]; } else if (addr == LUSR_OFF(__signal)) { error = ENOTSUP; - } else if (addr == LUSR_OFF(__signal)) { - error = ENOTSUP; } else if (addr == LUSR_OFF(u_fpstate)) { error = ENOTSUP; } else if (addr == LUSR_OFF(__magic)) { Index: src/sys/compat/linux/arch/powerpc/linux_ptrace.c diff -u src/sys/compat/linux/arch/powerpc/linux_ptrace.c:1.24 src/sys/compat/linux/arch/powerpc/linux_ptrace.c:1.25 --- src/sys/compat/linux/arch/powerpc/linux_ptrace.c:1.24 Sat Jan 4 00:10:03 2014 +++ src/sys/compat/linux/arch/powerpc/linux_ptrace.c Tue Apr 15 17:53:09 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_ptrace.c,v 1.24 2014/01/04 00:10:03 dsl Exp $ */ +/* $NetBSD: linux_ptrace.c,v 1.25 2014/04/15 17:53:09 maxv Exp $ */ /*- * Copyright (c) 1999, 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.24 2014/01/04 00:10:03 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.25 2014/04/15 17:53:09 maxv Exp $"); #include <sys/param.h> #include <sys/malloc.h> @@ -296,8 +296,6 @@ linux_sys_ptrace_arch(struct lwp *l, con *retval = regs->cr; else if (addr == LUSR_OFF(signal)) error = 1; - else if (addr == LUSR_OFF(signal)) - error = 1; else if (addr == LUSR_OFF(magic)) error = 1; else if (addr == LUSR_OFF(u_comm))