From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 21 Apr 2006 10:28:06 +0000 (+0000)
Subject: Added several type casts due to no portable way of doing printf of
X-Git-Tag: YAZ.2.1.18~12
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=d57ade59211707b9bcfacc61039e446c9fa3f36f;p=yaz-moved-to-github.git

Added several type casts due to no portable way of doing printf of
a size_t variable.
---

diff --git a/client/client.c b/client/client.c
index 74ca30f..1e7077f 100644
--- a/client/client.c
+++ b/client/client.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2005, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: client.c,v 1.303 2006-03-31 09:51:21 adam Exp $
+ * $Id: client.c,v 1.304 2006-04-21 10:28:06 adam Exp $
  */
 
 #include <stdio.h>
@@ -880,7 +880,7 @@ static void display_record(Z_External *r)
             if (!(*type->fun)(in, &rr, 0, 0))
             {
                 odr_perror(in, "Decoding constructed record.");
-                fprintf(stdout, "[Near %d]\n", odr_offset(in));
+                fprintf(stdout, "[Near %ld]\n", (long) odr_offset(in));
                 fprintf(stdout, "Packet dump:\n---------\n");
                 odr_dumpBER(stdout, (char*)r->u.octet_aligned->buf,
                             r->u.octet_aligned->len);
@@ -1550,7 +1550,8 @@ static int send_searchRequest(const char *arg)
             const char *pqf_msg;
             size_t off;
             int code = yaz_pqf_error (pqf_parser, &pqf_msg, &off);
-            printf("%*s^\n", off+4, "");
+            int ioff = off;
+            printf("%*s^\n", ioff+4, "");
             printf("Prefix query error: %s (code %d)\n", pqf_msg, code);
             
             yaz_pqf_destroy (pqf_parser);
@@ -2851,7 +2852,8 @@ int send_scanrequest(const char *query, int pp, int num, const char *term)
             const char *pqf_msg;
             size_t off;
             int code = yaz_pqf_error (pqf_parser, &pqf_msg, &off);
-            printf("%*s^\n", off+7, "");
+            int ioff = off;
+            printf("%*s^\n", ioff+7, "");
             printf("Prefix query error: %s (code %d)\n", pqf_msg, code);
             yaz_pqf_destroy (pqf_parser);
             return -1;
@@ -3945,7 +3947,7 @@ void wait_and_handle_response(int one_response_only)
         {
             FILE *f = ber_file ? ber_file : stdout;
             odr_perror(in, "Decoding incoming APDU");
-            fprintf(f, "[Near %d]\n", odr_offset(in));
+            fprintf(f, "[Near %ld]\n", (long) odr_offset(in));
             fprintf(f, "Packet dump:\n---------\n");
             odr_dumpBER(f, netbuffer, res);
             fprintf(f, "---------\n");
@@ -4055,7 +4057,8 @@ int cmd_cclparse(const char* arg)
     rpn = ccl_find_str (bibset, arg, &error, &pos);
     
     if (error) {
-        printf ("%*s^ - ", 3+strlen(last_cmd)+1+pos, " ");
+        int ioff = 3+strlen(last_cmd)+1+pos;
+        printf ("%*s^ - ", ioff, " ");
         printf ("%s\n", ccl_err_msg (error));
     }
     else
diff --git a/src/nmem.c b/src/nmem.c
index e2b2aa9..62c02e2 100644
--- a/src/nmem.c
+++ b/src/nmem.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2005, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: nmem.c,v 1.21 2006-02-01 20:29:19 adam Exp $
+ * $Id: nmem.c,v 1.22 2006-04-21 10:28:06 adam Exp $
  */
 
 /**
@@ -239,7 +239,8 @@ static nmem_block *get_block(size_t size)
         if (get < size)
             get = size;
         if(log_level)
-            yaz_log (log_level, "nmem get_block alloc new block size=%d", get);
+            yaz_log (log_level, "nmem get_block alloc new block size=%ld",
+                     (long) get);
 
         r = (nmem_block *)xmalloc(sizeof(*r));
         r->buf = (char *)xmalloc(r->size = get);
diff --git a/src/seshigh.c b/src/seshigh.c
index f47c417..5ad7ef3 100644
--- a/src/seshigh.c
+++ b/src/seshigh.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2005, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: seshigh.c,v 1.74 2006-04-05 12:05:36 mike Exp $
+ * $Id: seshigh.c,v 1.75 2006-04-21 10:28:07 adam Exp $
  */
 /**
  * \file seshigh.c
@@ -360,10 +360,10 @@ void ir_session(IOCHAN h, int event)
             if (!z_GDU(assoc->decode, &req->gdu_request, 0, 0))
             {
                 yaz_log(YLOG_WARN, "ODR error on incoming PDU: %s [element %s] "
-                        "[near byte %d] ",
+                        "[near byte %ld] ",
                         odr_errmsg(odr_geterror(assoc->decode)),
                         odr_getelement(assoc->decode),
-                        odr_offset(assoc->decode));
+                        (long) odr_offset(assoc->decode));
                 if (assoc->decode->error != OHTTP)
                 {
                     yaz_log(YLOG_WARN, "PDU dump:");
@@ -775,8 +775,8 @@ static void srw_bend_search(association *assoc, request *req,
                 const char *pqf_msg;
                 size_t off;
                 int code = yaz_pqf_error (pqf_parser, &pqf_msg, &off);
-                yaz_log(log_requestdetail, "Parse error %d %s near offset %d",
-                        code, pqf_msg, off);
+                yaz_log(log_requestdetail, "Parse error %d %s near offset %ld",
+                        code, pqf_msg, (long) off);
                 srw_error = YAZ_SRW_QUERY_SYNTAX_ERROR;
             }
             
@@ -2073,7 +2073,7 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb)
                 assoc->init->implementation_name,
                 odr_prepend(assoc->encode, "GFS", resp->implementationName));
 
-    version = odr_strdup(assoc->encode, "$Revision: 1.74 $");
+    version = odr_strdup(assoc->encode, "$Revision: 1.75 $");
     if (strlen(version) > 10)   /* check for unexpanded CVS strings */
         version[strlen(version)-2] = '\0';
     resp->implementationVersion = odr_prepend(assoc->encode,
diff --git a/src/xmalloc.c b/src/xmalloc.c
index 6ff7b4a..d48daa4 100644
--- a/src/xmalloc.c
+++ b/src/xmalloc.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2005, Index Data ApS
  * All rights reserved.
  *
- * $Id: xmalloc.c,v 1.6 2005-06-25 15:46:06 adam Exp $
+ * $Id: xmalloc.c,v 1.7 2006-04-21 10:28:07 adam Exp $
  */
 /**
  * \file xmalloc.c
@@ -258,11 +258,11 @@ void *xrealloc_f (void *o, size_t size, const char *file, int line)
 
     if(log_level)
         yaz_log (log_level,
-            "%s:%d: xrealloc(s=%d) %p -> %p", file, line, size, o, p);
+            "%s:%d: xrealloc(s=%ld) %p -> %p", file, line, (long) size, o, p);
     if (!p)
     {
-        yaz_log (YLOG_FATAL|YLOG_ERRNO, "Out of memory, realloc (%d bytes)",
-                 size);
+        yaz_log (YLOG_FATAL|YLOG_ERRNO, "Out of memory, realloc (%ld bytes)",
+                 (long) size);
         exit(1);
     }
     return p;
@@ -279,11 +279,13 @@ void *xmalloc_f (size_t size, const char *file, int line)
     }
 
     if (log_level)
-        yaz_log (log_level, "%s:%d: xmalloc(s=%d) %p", file, line, size, p);
+        yaz_log (log_level, "%s:%d: xmalloc(s=%ld) %p", file, line, 
+                 (long) size, p);
 
     if (!p)
     {
-        yaz_log (YLOG_FATAL, "Out of memory - malloc (%d bytes)", size);
+        yaz_log (YLOG_FATAL, "Out of memory - malloc (%ld bytes)",
+                 (long) size);
         exit (1);
     }
     return p;
@@ -299,11 +301,13 @@ void *xcalloc_f (size_t nmemb, size_t size, const char *file, int line)
     }
 
     if (log_level)
-        yaz_log (log_level, "%s:%d: xcalloc(s=%d) %p", file, line, size, p);
+        yaz_log (log_level, "%s:%d: xcalloc(s=%ld) %p", file, line,
+                 (long) size, p);
 
     if (!p)
     {
-        yaz_log (YLOG_FATAL, "Out of memory - calloc (%d, %d)", nmemb, size);
+        yaz_log (YLOG_FATAL, "Out of memory - calloc (%ld, %ld)",
+                 (long) nmemb, (long) size);
         exit (1);
     }
     return p;
@@ -319,7 +323,8 @@ char *xstrdup_f (const char *s, const char *file, int line)
     }
 
     if (log_level)
-        yaz_log (log_level, "%s:%d: xstrdup(s=%d) %p", file, line, strlen(s)+1, p);
+        yaz_log (log_level, "%s:%d: xstrdup(s=%ld) %p", file, line, 
+                 (long) strlen(s)+1, p);
 
     strcpy (p, s);
     return p;
diff --git a/src/zoom-c.c b/src/zoom-c.c
index 148b54e..c05e51c 100644
--- a/src/zoom-c.c
+++ b/src/zoom-c.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2005, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: zoom-c.c,v 1.69 2006-04-19 10:05:03 adam Exp $
+ * $Id: zoom-c.c,v 1.70 2006-04-21 10:28:07 adam Exp $
  */
 /**
  * \file zoom-c.c
@@ -918,8 +918,8 @@ ZOOM_resultset_records (ZOOM_resultset r, ZOOM_record *recs,
 
     if (!r)
         return ;
-    yaz_log(log_api, "%p ZOOM_resultset_records r=%p start=%d count=%d",
-            r, r, start, count);
+    yaz_log(log_api, "%p ZOOM_resultset_records r=%p start=%ld count=%ld",
+            r, r, (long) start, (long) count);
     if (count && recs)
         force_present = 1;
     ZOOM_resultset_retrieve (r, force_present, start, count);
@@ -1150,7 +1150,7 @@ static zoom_ret ZOOM_connection_send_init (ZOOM_connection c)
         ZOOM_options_get(c->options, "implementationName"),
         odr_prepend(c->odr_out, "ZOOM-C", ireq->implementationName));
 
-    version = odr_strdup(c->odr_out, "$Revision: 1.69 $");
+    version = odr_strdup(c->odr_out, "$Revision: 1.70 $");
     if (strlen(version) > 10)   /* check for unexpanded CVS strings */
         version[strlen(version)-2] = '\0';
     ireq->implementationVersion = odr_prepend(c->odr_out,
diff --git a/util/marcdump.c b/util/marcdump.c
index e056593..8014113 100644
--- a/util/marcdump.c
+++ b/util/marcdump.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2006, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: marcdump.c,v 1.36 2006-04-19 10:05:04 adam Exp $
+ * $Id: marcdump.c,v 1.37 2006-04-21 10:28:07 adam Exp $
  */
 
 #define _FILE_OFFSET_BITS 64
@@ -139,7 +139,8 @@ static void dump(const char *fname, const char *from, const char *to,
                 if (r < 5)
                 {
                     if (r && print_offset && verbose)
-                        printf ("<!-- Extra %d bytes at end of file -->\n", r);
+                        printf ("<!-- Extra %ld bytes at end of file -->\n",
+                                (long) r);
                     break;
                 }
                 while (*buf < '0' || *buf > '9')
diff --git a/util/pqf2pqf.xsl b/util/pqf2pqf.xsl
index 021117b..449f3e6 100644
--- a/util/pqf2pqf.xsl
+++ b/util/pqf2pqf.xsl
@@ -109,7 +109,7 @@
        Notice that the selection rules can equally either be written 
        'attr/@type=7' or 'attr[@type=8]' with no difference -->
   <!--
-  <xsl:template match="apt[attr/@type=7 and attr[@type=8]]">
+  <xsl:template match="apt[attr/@type=7 and attr/@type=8]">
     <apt>
       <xsl:apply-templates select="attr[@type=1]"/>
       <xsl:apply-templates select="attr[@type=2]"/>
diff --git a/util/yaziconv.c b/util/yaziconv.c
index 3cf8afe..a755a7d 100644
--- a/util/yaziconv.c
+++ b/util/yaziconv.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2005, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: yaziconv.c,v 1.4 2005-06-25 15:46:07 adam Exp $
+ * $Id: yaziconv.c,v 1.5 2006-04-21 10:28:07 adam Exp $
  */
 
 #if HAVE_CONFIG_H
@@ -51,8 +51,8 @@ void convert (FILE *inf, yaz_iconv_t cd, int verbose)
         }
         if (verbose > 1)
         {
-            fprintf (stderr, "yaz_iconv: inbytesleft=%d outbytesleft=%d\n",
-                     inbytesleft, outbytesleft);
+            fprintf (stderr, "yaz_iconv: inbytesleft=%ld outbytesleft=%ld\n",
+                     (long) inbytesleft, (long) outbytesleft);
 
         }
         r = yaz_iconv (cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
diff --git a/zoom/zoomsh.c b/zoom/zoomsh.c
index fb25837..cad805f 100644
--- a/zoom/zoomsh.c
+++ b/zoom/zoomsh.c
@@ -2,10 +2,12 @@
  * Copyright (C) 1995-2005, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: zoomsh.c,v 1.39 2005-11-02 21:41:27 adam Exp $
+ * $Id: zoomsh.c,v 1.40 2006-04-21 10:28:07 adam Exp $
  */
 
-/* ZOOM-C Shell */
+/** \file zoomsh.c
+    \brief ZOOM C command line tool (shell)
+*/
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -354,7 +356,7 @@ static void cmd_search (ZOOM_connection *c, ZOOM_resultset *r,
             int start = ZOOM_options_get_int (options, "start", 0);
             int count = ZOOM_options_get_int (options, "count", 0);
 
-            printf ("%s: %d hits\n", ZOOM_connection_option_get(c[i], "host"),
+            printf ("%s: %ld hits\n", ZOOM_connection_option_get(c[i], "host"),
                     ZOOM_resultset_size(r[i]));
             /* and display */
             display_records (c[i], r[i], start, count);
diff --git a/zoom/zoomtst1.c b/zoom/zoomtst1.c
index 9023f55..76ff2d7 100644
--- a/zoom/zoomtst1.c
+++ b/zoom/zoomtst1.c
@@ -1,8 +1,8 @@
-/*
- * $Id: zoomtst1.c,v 1.4 2005-06-25 15:46:08 adam Exp $
- *
- * Synchronous single-target client doing search (but no retrieval)
- */
+/* $Id: zoomtst1.c,v 1.5 2006-04-21 10:28:08 adam Exp $  */
+
+/** \file zoomtst1.c
+    \brief Synchronous single-target client doing search (but no retrieval)
+*/
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -34,7 +34,7 @@ int main(int argc, char **argv)
     if ((error = ZOOM_connection_error(z, &errmsg, &addinfo)))
         fprintf (stderr, "Error: %s (%d) %s\n", errmsg, error, addinfo);
     else
-        printf ("Result count: %d\n", ZOOM_resultset_size(r));
+        printf ("Result count: %ld\n", (long) ZOOM_resultset_size(r));
     ZOOM_resultset_destroy (r);
     ZOOM_connection_destroy (z);
     exit (0);
diff --git a/zoom/zoomtst2.c b/zoom/zoomtst2.c
index 40b197c..f8e3159 100644
--- a/zoom/zoomtst2.c
+++ b/zoom/zoomtst2.c
@@ -1,8 +1,8 @@
-/*
- * $Id: zoomtst2.c,v 1.7 2006-03-01 23:24:26 adam Exp $
- *
- * Asynchronous single-target client performing search (no retrieval)
- */
+/* $Id: zoomtst2.c,v 1.8 2006-04-21 10:28:08 adam Exp $  */
+
+/** \file zoomtst2.c
+    \brief Asynchronous single-target client performing search (no retrieval)
+*/
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -51,7 +51,7 @@ int main(int argc, char **argv)
         exit (2);
     }
     else /* OK print hit count */
-        printf ("Result count: %d\n", ZOOM_resultset_size(r));  
+        printf ("Result count: %ld\n", (long) ZOOM_resultset_size(r));  
     ZOOM_resultset_destroy (r);
     ZOOM_connection_destroy (z);
     exit (0);
diff --git a/zoom/zoomtst3.c b/zoom/zoomtst3.c
index 085b6ca..ba07960 100644
--- a/zoom/zoomtst3.c
+++ b/zoom/zoomtst3.c
@@ -1,8 +1,10 @@
-/*
- * $Id: zoomtst3.c,v 1.10 2006-04-19 09:05:09 adam Exp $
- *
- * Asynchronous multi-target client doing search and piggyback retrieval
- */
+/* $Id: zoomtst3.c,v 1.11 2006-04-21 10:28:08 adam Exp $  */
+
+/** \file zoomtst3.c
+    \brief Asynchronous multi-target client
+    
+    Performs search and piggyback retrieval of records
+*/
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -84,7 +86,7 @@ int main(int argc, char **argv)
         {
             /* OK, no major errors. Look at the result count */
             int pos;
-            printf ("%s: %d hits\n", tname, ZOOM_resultset_size(r[i]));
+            printf ("%s: %ld hits\n", tname, (long) ZOOM_resultset_size(r[i]));
             /* go through all records at target */
             for (pos = 0; pos < 10; pos++)
             {
diff --git a/zoom/zoomtst4.c b/zoom/zoomtst4.c
index 9bc0eaa..bb26fc2 100644
--- a/zoom/zoomtst4.c
+++ b/zoom/zoomtst4.c
@@ -1,9 +1,11 @@
-/*
- * $Id: zoomtst4.c,v 1.8 2005-06-25 15:46:08 adam Exp $
- *
- * Asynchronous multi-target going through proxy doing search and retrieve
- * using present.
- */
+/* $Id: zoomtst4.c,v 1.9 2006-04-21 10:28:08 adam Exp $  */
+
+/** \file zoomtst4.c
+    \brief Asynchronous multi-target client with separate present
+    
+    Asynchronous multi-target going through proxy doing search and retrieve
+    using present.
+*/
 
 #include <stdio.h>
 #include <string.h>
@@ -77,8 +79,8 @@ int main(int argc, char **argv)
                      ZOOM_connection_option_get(z[i], "host"),
                      errmsg, error, addinfo);
         else
-            printf ("%s: %d hits\n", ZOOM_connection_option_get(z[i], "host"),
-                    ZOOM_resultset_size(r[i]));
+            printf ("%s: %ld hits\n", ZOOM_connection_option_get(z[i], "host"),
+                    (long) ZOOM_resultset_size(r[i]));
     }
 
     /* destroy stuff and exit */
diff --git a/zoom/zoomtst5.c b/zoom/zoomtst5.c
index b2e466d..1d4cdda 100644
--- a/zoom/zoomtst5.c
+++ b/zoom/zoomtst5.c
@@ -1,8 +1,10 @@
-/*
- * $Id: zoomtst5.c,v 1.10 2005-06-25 15:46:08 adam Exp $
- *
- * Asynchronous multi-target client doing search, sort and present
- */
+/* $Id: zoomtst5.c,v 1.11 2006-04-21 10:28:08 adam Exp $  */
+
+/** \file zoomtst5.c
+    \brief Asynchronous multi-target client with sort
+    
+    Asynchronous multi-target client doing search, sort and present
+*/
 
 #include <stdio.h>
 #include <string.h>
@@ -84,8 +86,8 @@ int main(int argc, char **argv)
         {
             /* OK, no major errors. Look at the result count */
             int pos;
-            printf ("%s: %d hits\n", ZOOM_connection_option_get(z[i], "host"),
-                    ZOOM_resultset_size(r[i]));
+            printf ("%s: %ld hits\n", ZOOM_connection_option_get(z[i], "host"),
+                    (long) ZOOM_resultset_size(r[i]));
             /* go through first 20 records at target */
             for (pos = 0; pos < 20; pos++)
             {
diff --git a/zoom/zoomtst6.c b/zoom/zoomtst6.c
index b408170..90f41ff 100644
--- a/zoom/zoomtst6.c
+++ b/zoom/zoomtst6.c
@@ -1,8 +1,8 @@
-/*
- * $Id: zoomtst6.c,v 1.11 2005-11-04 15:51:02 mike Exp $
- *
- * Asynchronous multi-target client doing two searches
- */
+/* $Id: zoomtst6.c,v 1.12 2006-04-21 10:28:08 adam Exp $  */
+
+/** \file zoomtst6.c
+    \brief Asynchronous multi-target client with two searches
+*/
 
 #include <stdio.h>
 #include <yaz/nmem.h>
@@ -14,7 +14,7 @@ static void display_records (const char *tname, ZOOM_resultset r)
 {
     /* OK, no major errors. Look at the result count */
     int pos;
-    printf ("%s: %d hits\n", tname, ZOOM_resultset_size(r));
+    printf ("%s: %ld hits\n", tname, (long) ZOOM_resultset_size(r));
     /* go through all records at target */
     for (pos = 0; pos < 4; pos++)
     {
diff --git a/zoom/zoomtst7.c b/zoom/zoomtst7.c
index 2192abd..0f39f89 100644
--- a/zoom/zoomtst7.c
+++ b/zoom/zoomtst7.c
@@ -1,8 +1,8 @@
-/*
- * $Id: zoomtst7.c,v 1.14 2005-06-25 15:46:08 adam Exp $
- *
- * API test..
- */
+/* $Id: zoomtst7.c,v 1.15 2006-04-21 10:28:08 adam Exp $  */
+
+/** \file zoomtst7.c
+    \brief Mix of operations
+*/
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -16,7 +16,7 @@
 int main(int argc, char **argv)
 {
     int block;
-    size_t j, i;
+    int i, j;
     ZOOM_connection z;
     ZOOM_resultset r[10];  /* and result sets .. */
     ZOOM_options o;
@@ -160,7 +160,7 @@ int main(int argc, char **argv)
             if (block > 0)
                 while (ZOOM_event (1, &z))
                     ;
-            printf (" scan size = %d\n", ZOOM_scanset_size(scan));
+            printf (" scan size = %ld\n", (long) ZOOM_scanset_size(scan));
             for (j = 0; j<ZOOM_scanset_size (scan); j++)
             {
                 int occur, len;
diff --git a/zoom/zoomtst8.c b/zoom/zoomtst8.c
index cb1ff6d..9c73d05 100644
--- a/zoom/zoomtst8.c
+++ b/zoom/zoomtst8.c
@@ -1,8 +1,8 @@
-/*
- * $Id: zoomtst8.c,v 1.4 2005-06-25 15:46:08 adam Exp $
- *
- * Asynchronous multi-target client doing scan
- */
+/* $Id: zoomtst8.c,v 1.5 2006-04-21 10:28:08 adam Exp $  */
+
+/** \file zoomtst8.c
+    \brief Asynchronous multi-target client doing scan
+*/
 
 #include <stdio.h>
 #include <string.h>
@@ -64,7 +64,7 @@ int main(int argc, char **argv)
                      errmsg, error, addinfo);
         else
         {
-            size_t j;
+            int j;
             printf ("%s\n", ZOOM_connection_option_get(z[i], "host"));
             for (j = 0; j<ZOOM_scanset_size (s[i]); j++)
             {
diff --git a/zoom/zoomtst9.c b/zoom/zoomtst9.c
index a200d31..d3f6e2f 100644
--- a/zoom/zoomtst9.c
+++ b/zoom/zoomtst9.c
@@ -1,8 +1,8 @@
-/*
- * $Id: zoomtst9.c,v 1.1 2005-11-24 10:04:12 adam Exp $
- *
- * Program which illustrates the use of extended services update
- */
+/* $Id: zoomtst9.c,v 1.2 2006-04-21 10:28:08 adam Exp $  */
+
+/** \file zoomtst9.c
+    \brief Extended Service Update
+*/
 
 #include <stdio.h>
 #include <string.h>
diff --git a/ztest/ztest.c b/ztest/ztest.c
index c5f7432..e659570 100644
--- a/ztest/ztest.c
+++ b/ztest/ztest.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2005, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: ztest.c,v 1.78 2006-03-13 12:14:00 adam Exp $
+ * $Id: ztest.c,v 1.79 2006-04-21 10:28:09 adam Exp $
  */
 
 /*
@@ -149,9 +149,9 @@ int ztest_esrequest (void *handle, bend_esrequest_rr *rr)
                             if (!ill_ItemRequest (rr->decode, &item_req, 0, 0))
                             {
                                 yaz_log (log_level,
-                                    "Couldn't decode ItemRequest %s near %d",
+                                    "Couldn't decode ItemRequest %s near %ld",
                                        odr_errmsg(odr_geterror(rr->decode)),
-                                       odr_offset(rr->decode));
+                                       (long) odr_offset(rr->decode));
                             }
                             else
                                 yaz_log(log_level, "Decode ItemRequest OK");
@@ -172,9 +172,9 @@ int ztest_esrequest (void *handle, bend_esrequest_rr *rr)
                             if (!ill_APDU (rr->decode, &ill_apdu, 0, 0))
                             {
                                 yaz_log (log_level,
-                                    "Couldn't decode ILL APDU %s near %d",
+                                    "Couldn't decode ILL APDU %s near %ld",
                                        odr_errmsg(odr_geterror(rr->decode)),
-                                       odr_offset(rr->decode));
+                                       (long) odr_offset(rr->decode));
                                 yaz_log(log_level, "PDU dump:");
                                 odr_dumpBER(yaz_log_file(),
                                      (char *) r->u.single_ASN1_type->buf,