Get rid of a few warnings

diff --git a/src/yaz-proxy-config.cpp b/src/yaz-proxy-config.cpp
index 919c2ff..7a3134b 100644 (file)
--- a/src/yaz-proxy-config.cpp
+++ b/src/yaz-proxy-config.cpp
@@ -2,7 +2,7 @@
  * Copyright (c) 1998-2004, Index Data.
  * See the file LICENSE for details.
  * 
  * Copyright (c) 1998-2004, Index Data.
  * See the file LICENSE for details.
  * 

- * $Id: yaz-proxy-config.cpp,v 1.22 2004-01-07 13:24:12 adam Exp $
+ * $Id: yaz-proxy-config.cpp,v 1.23 2004-01-07 13:40:06 adam Exp $

  */
 
 #include <ctype.h>
  */
 
 #include <ctype.h>

@@ -700,7 +700,6 @@ char *Yaz_ProxyConfig::get_explain(ODR odr, const char *name, const char *db,
                xmlDocSetRootElement(doc, ptr2);
                
                xmlChar *buf_out;
                xmlDocSetRootElement(doc, ptr2);
                
                xmlChar *buf_out;

-               int len_out;

                xmlDocDumpMemory(doc, &buf_out, len);
                char *content = (char*) odr_malloc(odr, *len);
                memcpy(content, buf_out, *len);
                xmlDocDumpMemory(doc, &buf_out, len);
                char *content = (char*) odr_malloc(odr, *len);
                memcpy(content, buf_out, *len);

diff --git a/src/yaz-proxy-main.cpp b/src/yaz-proxy-main.cpp
index 62b478f..21796f6 100644 (file)
--- a/src/yaz-proxy-main.cpp
+++ b/src/yaz-proxy-main.cpp
@@ -2,7 +2,7 @@
  * Copyright (c) 1998-2004, Index Data.
  * See the file LICENSE for details.
  * 
  * Copyright (c) 1998-2004, Index Data.
  * See the file LICENSE for details.
  * 

- * $Id: yaz-proxy-main.cpp,v 1.28 2004-01-06 21:17:42 adam Exp $
+ * $Id: yaz-proxy-main.cpp,v 1.29 2004-01-07 13:40:06 adam Exp $

  */
 
 #include <signal.h>
  */
 
 #include <signal.h>

@@ -182,7 +182,6 @@ int main(int argc, char **argv)
 {
     int cont = 1;
     int run = 1;
 {
     int cont = 1;
     int run = 1;

-    static int mk_pid = 0;

     Yaz_SocketManager mySocketManager;
     Yaz_Proxy proxy(new Yaz_PDU_Assoc(&mySocketManager));
 
     Yaz_SocketManager mySocketManager;
     Yaz_Proxy proxy(new Yaz_PDU_Assoc(&mySocketManager));
 

@@ -236,7 +235,7 @@ int main(int argc, char **argv)
                break;
            case SIGTERM:
                yaz_log(LOG_LOG, "Received SIGTERM from child %ld",
                break;
            case SIGTERM:
                yaz_log(LOG_LOG, "Received SIGTERM from child %ld",

-                       WTERMSIG(status), (long) p);
+                       (long) p);

                cont = 0;
                break;
            default:
                cont = 0;
                break;
            default:

diff --git a/src/yaz-socket-manager.cpp b/src/yaz-socket-manager.cpp
index 3215d3b..3398090 100644 (file)
--- a/src/yaz-socket-manager.cpp
+++ b/src/yaz-socket-manager.cpp
@@ -2,7 +2,7 @@
  * Copyright (c) 1998-2004, Index Data.
  * See the file LICENSE for details.
  * 
  * Copyright (c) 1998-2004, Index Data.
  * See the file LICENSE for details.
  * 

- * $Id: yaz-socket-manager.cpp,v 1.23 2004-01-05 11:31:04 adam Exp $
+ * $Id: yaz-socket-manager.cpp,v 1.24 2004-01-07 13:40:06 adam Exp $

  */
 #include <assert.h>
 #ifdef WIN32
  */
 #include <assert.h>
 #ifdef WIN32

@@ -143,7 +143,7 @@ int Yaz_SocketManager::processEvent()
            max = fd;
        if (p->timeout >= 0)
        {
            max = fd;
        if (p->timeout >= 0)
        {

-           unsigned timeout_this;
+           int timeout_this;

            timeout_this = p->timeout;
            if (p->last_activity)
                timeout_this -= now - p->last_activity;
            timeout_this = p->timeout;
            if (p->last_activity)
                timeout_this -= now - p->last_activity;