2001-11-09 Robert Collins <rbtcollins@hotmail.com>

        * simpsock.cc (cvsid): Avoid compiler warnings (not used, deprecated conversion).
        (SimpleSocket::SimpleSocket): Avoid compiler warnings (deprecated conversion).
        (SimpleSocket::printf): Ditto.
        (SimpleSocket::write): Ditto.
        * simpsock.h (SimpleSocket): Avoid compiler warnings for constructor,
        printf and write.
        * nio-ftp.cc (cvsid): Avoid compiler warnings (not used, deprecated conversion).
        (NetIO_FTP::NetIO_FTP): Remove unused variable done.
        * nio-http.cc (cvsid): Avoid compiler warnings (not used, deprecated conversion).

diff --git a/ChangeLog b/ChangeLog
index a0969aca92abdf620edd1ecbcb4d00aac5d702f3..2b9682eee0b98e69719246ea03b2615660d2c686 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2001-11-09  Robert Collins  <rbtcollins@hotmail.com>
+
+       * simpsock.cc (cvsid): Avoid compiler warnings (not used, deprecated conversion).
+       (SimpleSocket::SimpleSocket): Avoid compiler warnings (deprecated conversion).
+       (SimpleSocket::printf): Ditto.
+       (SimpleSocket::write): Ditto.
+       * simpsock.h (SimpleSocket): Avoid compiler warnings for constructor,
+       printf and write.
+       * nio-ftp.cc (cvsid): Avoid compiler warnings (not used, deprecated conversion).
+       (NetIO_FTP::NetIO_FTP): Remove unused variable done.
+       * nio-http.cc (cvsid): Avoid compiler warnings (not used, deprecated conversion).
+
 2001-11-07  Charles Wilson  <cwilson@ece.gatech.edu>
 
        * geturl.cc (get_url_to_string): clean up memory leak

diff --git a/nio-ftp.cc b/nio-ftp.cc
index 970f6a7fa51fab06e6eccd748b4e12f2e2296728..fe69835f2189f88ba6b8aa6e68f0c80819b4dab9 100644 (file)
--- a/nio-ftp.cc
+++ b/nio-ftp.cc
@@ -16,7 +16,9 @@
 /* This file is responsible for implementing all direct FTP protocol
    channels.  It is intentionally simplistic. */
 
-static char *cvsid = "\n%%% $Id$\n";
+#if 0
+static const char *cvsid = "\n%%% $Id$\n";
+#endif
 
 #include "win32.h"
 #include "winsock.h"
@@ -70,7 +72,6 @@ NetIO_FTP::NetIO_FTP (char *Purl, BOOL allow_ftp_auth)
   if (cmd == 0)
     {
       SimpleSocket *c = new SimpleSocket (host, port);
-      int done = 0;
       code = ftp_line (c);
 
 auth_retry:

diff --git a/nio-http.cc b/nio-http.cc
index a0333fe90659c868ecb284b060b1c93b8389952e..962dcfda4458e87a0a956a1c9782b8674b7c3c71 100644 (file)
--- a/nio-http.cc
+++ b/nio-http.cc
@@ -16,7 +16,9 @@
 /* This file is responsible for implementing all direct HTTP protocol
    channels.  It is intentionally simplistic. */
 
-static char *cvsid = "\n%%% $Id$\n";
+#if 0
+static const char *cvsid = "\n%%% $Id$\n";
+#endif
 
 #include "win32.h"
 #include "winsock.h"

diff --git a/simpsock.cc b/simpsock.cc
index 9ae9f5a8102faa15af36ffdb88cea3f1da535d95..3aba9e589cc38d5e1bbfdcce424304e11e1c9f7b 100644 (file)
--- a/simpsock.cc
+++ b/simpsock.cc
@@ -15,7 +15,9 @@
 
 /* Simplified socket access functions */
 
-static char *cvsid = "\n%%% $Id$\n";
+#if 0
+static const char *cvsid = "\n%%% $Id$\n";
+#endif
 
 #include "win32.h"
 #include <winsock.h>
@@ -28,7 +30,7 @@ static char *cvsid = "\n%%% $Id$\n";
 
 #define SSBUFSZ 1024
 
-SimpleSocket::SimpleSocket (char *hostname, int port)
+SimpleSocket::SimpleSocket (const char *hostname, int port)
 {
   static int initted = 0;
   if (!initted)
@@ -108,7 +110,7 @@ SimpleSocket::ok ()
 }
 
 int
-SimpleSocket::printf (char *fmt, ...)
+SimpleSocket::printf (const char *fmt, ...)
 {
   char buf[SSBUFSZ];
   va_list args;
@@ -118,7 +120,7 @@ SimpleSocket::printf (char *fmt, ...)
 }
 
 int
-SimpleSocket::write (char *buf, int len)
+SimpleSocket::write (const char *buf, int len)
 {
   return send (s, buf, len, 0);
 }

diff --git a/simpsock.h b/simpsock.h
index cde49dd9f1f0dcde238fb34c149ad4359c172c18..7fbf4a21c23ca128cd27b196081ce06d1d26b266 100644 (file)
--- a/simpsock.h
+++ b/simpsock.h
@@ -23,13 +23,13 @@ class SimpleSocket {
   int fill ();
 
  public:
-  SimpleSocket (char *hostname, int port);
+  SimpleSocket (const char *hostname, int port);
   ~SimpleSocket ();
 
   int ok ();
 
-  int printf (char *fmt, ...);
-  int write (char *buf, int len);
+  int printf (const char *fmt, ...);
+  int write (const char *buf, int len);
 
   char *gets ();
   int  read (char *buf, int len);