From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <sh@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1921)
 id 13CCE3858015; Thu,  7 Oct 2021 16:02:25 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 13CCE3858015
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Sebastian Huber <sh@sourceware.org>
To: newlib-cvs@sourceware.org
Subject: [newlib-cygwin] sys/tree.h: Simplify chain of conditions
X-Act-Checkin: newlib-cygwin
X-Git-Author: Sebastian Huber <sebastian.huber@embedded-brains.de>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: 098cf0f98dbb310c6a7ef94f0bdaf683f276767b
X-Git-Newrev: ee30f991c38851f1bfbbf72d19c5c6ee1b97f32a
Message-Id: <20211007160225.13CCE3858015@sourceware.org>
Date: Thu,  7 Oct 2021 16:02:25 +0000 (GMT)
X-BeenThere: newlib-cvs@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Newlib GIT logs <newlib-cvs.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/newlib-cvs>,
 <mailto:newlib-cvs-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/newlib-cvs/>
List-Help: <mailto:newlib-cvs-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/newlib-cvs>,
 <mailto:newlib-cvs-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Oct 2021 16:02:25 -0000

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=ee30f991c38851f1bfbbf72d19c5c6ee1b97f32a

commit ee30f991c38851f1bfbbf72d19c5c6ee1b97f32a
Author: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date:   Tue Oct 5 15:39:10 2021 +0200

    sys/tree.h: Simplify chain of conditions
    
    In RB_GENERATE_REMOVE_COLOR() simplify a chain of conditions of the following
    pattern
    
    if (x) {
      ...
    } else if (!x) {
      ...
    }
    
    to
    
    if (x) {
      ...
    } else {
      ...
    }

Diff:
---
 newlib/libc/include/sys/tree.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/newlib/libc/include/sys/tree.h b/newlib/libc/include/sys/tree.h
index 15831c7dd..180809e9b 100644
--- a/newlib/libc/include/sys/tree.h
+++ b/newlib/libc/include/sys/tree.h
@@ -528,7 +528,7 @@ name##_RB_REMOVE_COLOR(struct name *head, struct type *parent)		\
 				RB_ROTATE_LEFT(head, tmp, oright, field); \
 				RB_COLOR(oright, field) = RB_BLACK;	\
 				tmp = oright;				\
-			} else if (!RB_ISRED(RB_LEFT(tmp, field), field)) { \
+			} else {					\
 				RB_COLOR(tmp, field) = RB_RED;		\
 				elm = parent;				\
 				parent = RB_PARENT(elm, field);		\