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

        * fromcwd: Fix compiler warnings for cvsid.
        (canonicalize_version): Fix compilter warnings.
        (do_fromcwd): Ditto.
        * version.h: Fix compiler warnings for canonicalize_version.

diff --git a/ChangeLog b/ChangeLog
index d795f8a80b032f9b9b3053e599cd2d59118d2e69..8b006e7e635751e925fbdbb4ccb3d9b501fce369 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-11-03  Robert Collins  <rbtcollins@hotmail.com>
+
+       * fromcwd: Fix compiler warnings for cvsid.
+       (canonicalize_version): Fix compilter warnings.
+       (do_fromcwd): Ditto.
+       * version.h: Fix compiler warnings for canonicalize_version.
+
 2001-11-03  Robert Collins  <rbtcollins@hotmail.com>
 
        * res.rc (IDD_CHOOSE): Move the view caption to the right hand side.

diff --git a/fromcwd.cc b/fromcwd.cc
index 88a64945752fe2a9ce505ddef25601e7ae102ed0..cecbe48f202ef536699c081bdff2f3847324e079 100644 (file)
--- a/fromcwd.cc
+++ b/fromcwd.cc
@@ -25,7 +25,9 @@
    (otherwise, why would you have asked to install it?).  Note
    that we search recursively. */
 
-static char *cvsid = "\n%%% $Id$\n";
+#if 0
+static const char *cvsid = "\n%%% $Id$\n";
+#endif
 
 #include "win32.h"
 
@@ -56,11 +58,12 @@ is_test_version (char *v)
 }
 
 char *
-canonicalize_version (char *v)
+canonicalize_version (const char *v)
 {
   static char nv[3][100];
   static int idx = 0;
-  char *np, *dp, *ov = v;
+  char *np ;
+  const char *dp;
   int i;
 
   idx = (idx+1) % 3;
@@ -126,7 +129,7 @@ do_fromcwd (HINSTANCE h)
 {
   if (_access ("./setup.ini", 0) == 0)
     {
-      mirror_site = ".";
+      mirror_site = (char *) ".";
       next_dialog = IDD_S_LOAD_INI;
       return;
     }

diff --git a/version.h b/version.h
index e52de3be494490b3eada2797ea6689148b6fef94..c9bebe4261c85740fa6149aadfdd42c4fd0e619f 100644 (file)
--- a/version.h
+++ b/version.h
@@ -17,4 +17,4 @@
 
 extern char *version;
 
-extern char *canonicalize_version (char *);
+extern char *canonicalize_version (const char *);