From cf2ac50f084efaae242a477cc2af8d164e813872 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 24 Mar 2004 20:50:12 +0000 Subject: [PATCH] (really_getpid): Reorganize code to avoid warning. --- nptl/sysdeps/unix/sysv/linux/getpid.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/nptl/sysdeps/unix/sysv/linux/getpid.c b/nptl/sysdeps/unix/sysv/linux/getpid.c index 1c3532b..476981e 100644 --- a/nptl/sysdeps/unix/sysv/linux/getpid.c +++ b/nptl/sysdeps/unix/sysv/linux/getpid.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2003 Free Software Foundation, Inc. +/* Copyright (C) 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 2003. @@ -28,11 +28,12 @@ static inline __attribute__((always_inline)) pid_t really_getpid (pid_t oldval); static inline __attribute__((always_inline)) pid_t really_getpid (pid_t oldval) { - pid_t selftid; - if (__builtin_expect (oldval == 0 - && ((selftid = THREAD_GETMEM (THREAD_SELF, tid)) - != 0), 1)) - return selftid; + if (__builtin_expect (oldval == 0, 1)) + { + pid_t selftid = THREAD_GETMEM (THREAD_SELF, tid); + if (__builtin_expect (selftid != 0), 1) + return selftid; + } INTERNAL_SYSCALL_DECL (err); pid_t result = INTERNAL_SYSCALL (getpid, err, 0); -- 2.7.4