X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ftsearch.c;h=39f5960621c13cc456e24bf94738b38468d738a1;hb=25a6731afb775d2fe8ab53ea944158137d458462;hp=a2e053aa53ee1236da07bbefe5b244518c8d2f1c;hpb=441aa3044f43e5572f58c354f01e6bc070acd5c7;p=gnulib.git

diff --git a/lib/tsearch.c b/lib/tsearch.c
index a2e053aa5..39f596062 100644
--- a/lib/tsearch.c
+++ b/lib/tsearch.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1995-1997, 2000, 2006-2007 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1997, 2000, 2006-2007, 2009-2014 Free Software
+   Foundation, Inc.
    Contributed by Bernd Schmidt <crux@Pool.Informatik.RWTH-Aachen.DE>, 1997.
 
    NOTE: The canonical source of this file is maintained with the GNU C
@@ -84,6 +85,10 @@
    In this case, A has been rotated left.  This preserves the ordering of the
    binary tree.  */
 
+/* Don't use __attribute__ __nonnull__ in this compilation unit.  Otherwise gcc
+   optimizes away the rootp == NULL tests below.  */
+#define _GL_ARG_NONNULL(params)
+
 #include <config.h>
 
 /* Specification.  */
@@ -157,7 +162,7 @@ check_tree (node root)
   if (root == NULL)
     return;
   root->red = 0;
-  for(p = root->left; p; p = p->left)
+  for (p = root->left; p; p = p->left)
     cnt += !p->red;
   check_tree_recurse (root, 0, cnt);
 }