From 06dec5f5b1364f4c31d1858f35a16f61d325120a Mon Sep 17 00:00:00 2001
From: Heikki Levanto <heikki@indexdata.dk>
Date: Fri, 19 Nov 2004 15:52:58 +0000
Subject: [PATCH] Fixed minor problems with deb/stable

---
 index/zvrank.c   |    6 +++---
 rset/rsbetween.c |    4 ++--
 rset/rset.c      |    5 +++--
 test/api/t4.c    |    4 ++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/index/zvrank.c b/index/zvrank.c
index ae03f92..a6d2153 100644
--- a/index/zvrank.c
+++ b/index/zvrank.c
@@ -1,4 +1,4 @@
-/* $Id: zvrank.c,v 1.13 2004-11-04 13:09:06 heikki Exp $
+/* $Id: zvrank.c,v 1.14 2004-11-19 15:52:58 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
    Index Data Aps
 
@@ -764,13 +764,13 @@ static void zv_end (struct zebra_register *reg, void *rsi)
  */
 static void zv_add (void *rsi, int seqno, TERMID term) {
     RS rs=(RS)rsi;
+    int *ip = term->rankpriv;
+    int i=*ip;
     if (!term) 
     {
         yaz_log(log_level, "zvrank zv_add seqno=%d NULL term",seqno );
         return;
     }
-    int *ip = term->rankpriv;
-    int i=*ip;
     rs->rdoc->terms[i].locc++;
     yaz_log(log_level, "zvrank zv_add seqno=%d '%s' term_index=%d cnt=%d", 
              seqno, term->name, i, rs->rdoc->terms[i].locc );
diff --git a/rset/rsbetween.c b/rset/rsbetween.c
index 5081bd7..0f304f4 100644
--- a/rset/rsbetween.c
+++ b/rset/rsbetween.c
@@ -1,4 +1,4 @@
-/* $Id: rsbetween.c,v 1.32 2004-11-19 10:27:13 heikki Exp $
+/* $Id: rsbetween.c,v 1.33 2004-11-19 15:52:58 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
    Index Data Aps
 
@@ -243,8 +243,8 @@ static int r_read (RSFD rfd, void *buf, TERMID *term)
     struct rset_between_rfd *p=(struct rset_between_rfd *)rfd->priv;
     const struct key_control *kctrl=rfd->rset->keycontrol;
     int cmp;
-    yaz_log(log_level,"== read: term=%p",term);
     TERMID dummyterm=0;
+    yaz_log(log_level,"== read: term=%p",term);
     if (!term)
         term=&dummyterm;
     while ( rset_read(p->andrfd,buf,term) )
diff --git a/rset/rset.c b/rset/rset.c
index 9520639..c17528d 100644
--- a/rset/rset.c
+++ b/rset/rset.c
@@ -1,4 +1,4 @@
-/* $Id: rset.c,v 1.40 2004-11-19 10:27:14 heikki Exp $
+/* $Id: rset.c,v 1.41 2004-11-19 15:52:59 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -41,13 +41,14 @@ static int log_level_initialized=0;
 
 RSFD rfd_create_base(RSET rs)
 {
+    RSFD rnew=rs->free_list;
+
     if (!log_level_initialized) 
     {
         log_level=yaz_log_module_level("rset");
         log_level_initialized=1;
     }
 
-    RSFD rnew=rs->free_list;
     if (rnew) 
     {
         rs->free_list=rnew->next;
diff --git a/test/api/t4.c b/test/api/t4.c
index b38a9a5..944b277 100644
--- a/test/api/t4.c
+++ b/test/api/t4.c
@@ -1,4 +1,4 @@
-/* $Id: t4.c,v 1.11 2004-10-29 13:02:39 heikki Exp $
+/* $Id: t4.c,v 1.12 2004-11-19 15:52:59 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -33,7 +33,7 @@ const char *myrec[] = {
 int main(int argc, char **argv)
 {
     int i;
-    ZebraService zs = start_up(0, argc, argv);;
+    ZebraService zs = start_up(0, argc, argv);
     ZebraHandle zh = zebra_open (zs);
 
     init_data(zh,myrec);
-- 
1.7.10.4