-/* $Id: rsbool.c,v 1.59 2006-06-06 21:01:30 adam Exp $
- Copyright (C) 1995-2006
+/* $Id: rsbool.c,v 1.62 2007-01-15 15:10:19 adam Exp $
+ Copyright (C) 1995-2007
Index Data ApS
This file is part of the Zebra server.
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
+
*/
#include <stdio.h>
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;
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);