Bump year. Change Aps->ApS

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

diff --git a/rset/rset.c b/rset/rset.c
index a58d5f9..f5bcdb5 100644 (file)
--- a/rset/rset.c
+++ b/rset/rset.c
@@ -1,6 +1,6 @@
-/* $Id: rset.c,v 1.39 2004-11-04 13:54:08 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: rset.c,v 1.42 2005-01-15 19:38:34 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -41,24 +41,25 @@ 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;
         assert(rnew->rset==rs);
-        logf(log_level,"rfd-create_base (fl): rfd=%p rs=%p fl=%p priv=%p", 
+        yaz_log(log_level,"rfd-create_base (fl): rfd=%p rs=%p fl=%p priv=%p", 
                        rnew, rs, rs->free_list, rnew->priv); 
     } else {
         rnew=nmem_malloc(rs->nmem, sizeof(*rnew));
         rnew->priv=NULL;
         rnew->rset=rs;
-        logf(log_level,"rfd_create_base (new): rfd=%p rs=%p fl=%p priv=%p", 
+        yaz_log(log_level,"rfd_create_base (new): rfd=%p rs=%p fl=%p priv=%p", 
                        rnew, rs, rs->free_list, rnew->priv); 
     }
     rnew->next=NULL; /* not part of any (free?) list */
@@ -70,7 +71,7 @@ RSFD rfd_create_base(RSET rs)
 void rfd_delete_base(RSFD rfd) 
 {
     RSET rs=rfd->rset;
-    logf(log_level,"rfd_delete_base: rfd=%p rs=%p priv=%p fl=%p",
+    yaz_log(log_level,"rfd_delete_base: rfd=%p rs=%p priv=%p fl=%p",
             rfd, rs, rfd->priv, rs->free_list); 
     assert(NULL == rfd->next); 
     rfd->next=rs->free_list;
@@ -90,7 +91,7 @@ RSET rset_create_base(const struct rset_control *sel,
     else
         M=nmem_create();
     rnew = (RSET) nmem_malloc(M,sizeof(*rnew));
-    logf (log_level, "rs_create(%s) rs=%p (nm=%p)", sel->desc, rnew, nmem); 
+    yaz_log (log_level, "rs_create(%s) rs=%p (nm=%p)", sel->desc, rnew, nmem); 
     rnew->nmem=M;
     if (nmem)
         rnew->my_nmem=0;
@@ -111,7 +112,7 @@ RSET rset_create_base(const struct rset_control *sel,
 void rset_delete (RSET rs)
 {
     (rs->count)--;
-    logf(log_level,"rs_delete(%s), rs=%p, count=%d",
+    yaz_log(log_level,"rs_delete(%s), rs=%p, count=%d",
             rs->control->desc, rs, rs->count); 
     if (!rs->count)
     {
@@ -124,7 +125,7 @@ void rset_delete (RSET rs)
 RSET rset_dup (RSET rs)
 {
     (rs->count)++;
-    logf(log_level,"rs_dup(%s), rs=%p, count=%d",
+    yaz_log(log_level,"rs_dup(%s), rs=%p, count=%d",
             rs->control->desc, rs, rs->count); 
     return rs;
 }
@@ -136,14 +137,14 @@ int rset_default_forward(RSFD rfd, void *buf, TERMID *term,
     int cmp=rfd->rset->scope;
     if (log_level)
     {
-        logf (log_level, "rset_default_forward starting '%s' (ct=%p rfd=%p)",
+        yaz_log (log_level, "rset_default_forward starting '%s' (ct=%p rfd=%p)",
                     rfd->rset->control->desc, rfd->rset, rfd);
         /* key_logdump(log_level, untilbuf); */
     }
     while ( (cmp>=rfd->rset->scope) && (more))
     {
         if (log_level)  /* time-critical, check first */
-            logf(log_level,"rset_default_forward looping m=%d c=%d",more,cmp);
+            yaz_log(log_level,"rset_default_forward looping m=%d c=%d",more,cmp);
         more=rset_read(rfd, buf, term);
         if (more)
             cmp=(rfd->rset->keycontrol->cmp)(untilbuf,buf);
@@ -151,7 +152,7 @@ int rset_default_forward(RSFD rfd, void *buf, TERMID *term,
             key_logdump(log_level,buf); */
     }
     if (log_level)
-        logf (log_level, "rset_default_forward exiting m=%d c=%d",more,cmp);
+        yaz_log (log_level, "rset_default_forward exiting m=%d c=%d",more,cmp);
 
     return more;
 }
@@ -195,7 +196,7 @@ TERMID rset_term_create (const char *name, int length, const char *flags,
 
 {
     TERMID t;
-    logf (log_level, "term_create '%s' %d f=%s type=%d nmem=%p",
+    yaz_log (log_level, "term_create '%s' %d f=%s type=%d nmem=%p",
             name, length, flags, type, nmem);
     t= (TERMID) nmem_malloc (nmem, sizeof(*t));
     if (!name)