X-Git-Url: http://git.indexdata.com/?p=yazproxy-moved-to-github.git;a=blobdiff_plain;f=src%2Fyaz-proxy.cpp;h=20d8e28961de75475c42f02b66af6e20dee7fa9a;hp=814c0f89d1f1f385be7be5790833190b601af0af;hb=823c76005503eb00b3681eedf0559a0dc06883ce;hpb=3481ecb892e17f707a06335f955e65e62be35f30

diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp
index 814c0f8..20d8e28 100644
--- a/src/yaz-proxy.cpp
+++ b/src/yaz-proxy.cpp
@@ -1,5 +1,5 @@
 /* This file is part of YAZ proxy
-   Copyright (C) 1998-2009 Index Data
+   Copyright (C) 1998-2011 Index Data
 
 YAZ proxy 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
@@ -864,13 +864,13 @@ void Yaz_Proxy::display_diagrecs(Z_DiagRec **pp, int num)
         switch (r->which)
         {
         case Z_DefaultDiagFormat_v2Addinfo:
-            yaz_log(YLOG_LOG, "%sError %d %s:%s",
+            yaz_log(YLOG_LOG, "%sError " ODR_INT_PRINTF " %s:%s",
                     m_session_str,
                     *r->condition, diagbib1_str(*r->condition),
                     r->u.v2Addinfo);
             break;
         case Z_DefaultDiagFormat_v3Addinfo:
-            yaz_log(YLOG_LOG, "%sError %d %s:%s",
+            yaz_log(YLOG_LOG, "%sError " ODR_INT_PRINTF " %s:%s",
                     m_session_str,
                     *r->condition, diagbib1_str(*r->condition),
                     r->u.v3Addinfo);
@@ -1494,7 +1494,7 @@ int Yaz_Proxy::send_to_client(Z_APDU *apdu)
             }
             if (sr->resultCount)
             {
-                yaz_log(YLOG_LOG, "%s%d hits", m_session_str,
+                yaz_log(YLOG_LOG, "%s" ODR_INT_PRINTF " hits", m_session_str,
                         *sr->resultCount);
                 if (*sr->resultCount < 0)
                 {
@@ -2310,7 +2310,7 @@ Z_Records *Yaz_Proxy::create_nonSurrogateDiagnostics(ODR odr,
 {
     Z_Records *rec = (Z_Records *)
         odr_malloc (odr, sizeof(*rec));
-    int *err = (int *)
+    Odr_int *err = (Odr_int *)
         odr_malloc (odr, sizeof(*err));
     Z_DiagRec *drec = (Z_DiagRec *)
         odr_malloc (odr, sizeof(*drec));
@@ -3558,7 +3558,7 @@ void Yaz_Proxy::pre_init()
     const char *zurl_in_use[MAX_ZURL_PLEX];
     int limit_bw, limit_pdu, limit_req, limit_search;
     int target_idletime, client_idletime;
-    int max_sockets;
+    int max_sockets = m_max_sockets;
     int max_clients;
     int keepalive_limit_bw, keepalive_limit_pdu;
     int pre_init;