Version 2.0.50

[idzebra-moved-to-github.git] / rset / rsbool.c

diff --git a/rset/rsbool.c b/rset/rsbool.c
index 371e912..2335771 100644 (file)
--- a/rset/rsbool.c
+++ b/rset/rsbool.c
@@ -1,8 +1,5 @@
-/* $Id: rsbool.c,v 1.59 2006-06-06 21:01:30 adam Exp $
-   Copyright (C) 1995-2006
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2011 Index Data
 
 Zebra is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -15,11 +12,14 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -176,14 +176,12 @@ static int r_read_not(RSFD rfd, void *buf, TERMID *term)
     struct rfd_private *p = (struct rfd_private *)rfd->priv;
     const struct rset_key_control *kctrl = rfd->rset->keycontrol;
 
-    while (p->more_l || p->more_r)
+    while (p->more_l)
     {
         int cmp;
 
-        if (p->more_l && p->more_r)
+        if (p->more_r)
             cmp = (*kctrl->cmp)(p->buf_l, p->buf_r);
-        else if (p->more_r)
-            cmp = rfd->rset->scope;
         else
             cmp = -rfd->rset->scope;
 
@@ -197,8 +195,10 @@ static int r_read_not(RSFD rfd, void *buf, TERMID *term)
             return 1;
         }
         else if (cmp >= rfd->rset->scope)   /* cmp >1 */
+        {
             p->more_r = rset_forward( p->rfd_r, p->buf_r, 
-                          &p->term_r, p->buf_l);
+                                      &p->term_r, p->buf_l);
+        }
         else
         { /* cmp== -1, 0, or 1 */
             memcpy (buf, p->buf_l, kctrl->key_size);
@@ -275,6 +275,7 @@ static void r_get_terms(RSET ct, TERMID *terms, int maxterms, int *curterm)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab