8 files changed, 23 insertions, 23 deletions

diff --git a/Source/kwsys/CommandLineArguments.cxx b/Source/kwsys/CommandLineArguments.cxx
index cdf254f..38061a5 100644
--- a/Source/kwsys/CommandLineArguments.cxx
+++ b/Source/kwsys/CommandLineArguments.cxx
@@ -513,7 +513,7 @@ const char* CommandLineArguments::GetArgv0()
 //----------------------------------------------------------------------------
 unsigned int CommandLineArguments::GetLastArgument()
 {
-  return (unsigned int)this->Internals->LastArgument + 1;
+  return static_cast<unsigned int>(this->Internals->LastArgument + 1);
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/kwsys/Glob.cxx b/Source/kwsys/Glob.cxx
index f395126..15f0e71 100644
--- a/Source/kwsys/Glob.cxx
+++ b/Source/kwsys/Glob.cxx
@@ -338,7 +338,7 @@ bool Glob::FindFiles(const kwsys_stl::string& inexpr)
     {
     if ( cc > 0 && expr[cc] == '/' && expr[cc-1] != '\\' )
       {
-      last_slash = (int)cc;
+      last_slash = static_cast<int>(cc);
       }
     if ( cc > 0 &&
       (expr[cc] == '[' || expr[cc] == '?' || expr[cc] == '*') &&
diff --git a/Source/kwsys/Registry.cxx b/Source/kwsys/Registry.cxx
index b09898a..685c50b 100644
--- a/Source/kwsys/Registry.cxx
+++ b/Source/kwsys/Registry.cxx
@@ -704,7 +704,7 @@ void RegistryHelper::SetSubKey(const char* sk)
 //----------------------------------------------------------------------------
 char *RegistryHelper::Strip(char *str)
 {
-  int cc;
+  size_t cc;
   size_t len;
   char *nstr;
   if ( !str )
@@ -713,7 +713,7 @@ char *RegistryHelper::Strip(char *str)
     }
   len = strlen(str);
   nstr = str;
-  for( cc=0; cc<(int)len; cc++ )
+  for( cc=0; cc < len; cc++ )
     {
     if ( !isspace( *nstr ) )
       {
@@ -721,7 +721,7 @@ char *RegistryHelper::Strip(char *str)
       }
     nstr ++;
     }
-  for( cc=int(strlen(nstr)-1); cc>=0; cc-- )
+  for( cc= strlen(nstr)-1; cc>=0; cc-- )
     {
     if ( !isspace( nstr[cc] ) )
       {
diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx
index 06eccde..1107fe5 100644
--- a/Source/kwsys/SystemTools.cxx
+++ b/Source/kwsys/SystemTools.cxx
@@ -237,10 +237,10 @@ SystemTools::GetTime(void)
   struct timeval t;
 #ifdef GETTIMEOFDAY_NO_TZ
   if (gettimeofday(&t) == 0)
-    return (double)t.tv_sec + t.tv_usec*0.000001;
+    return static_cast<double>(t.tv_sec) + t.tv_usec*0.000001;
 #else /* !GETTIMEOFDAY_NO_TZ */
-  if (gettimeofday(&t, (struct timezone *)NULL) == 0)
-    return (double)t.tv_sec + t.tv_usec*0.000001;
+  if (gettimeofday(&t, static_cast<struct timezone *>(NULL)) == 0)
+    return static_cast<double>(t.tv_sec) + t.tv_usec*0.000001;
 #endif /* !GETTIMEOFDAY_NO_TZ */
   }
 #endif /* !HAVE_GETTIMEOFDAY */
@@ -248,11 +248,12 @@ SystemTools::GetTime(void)
 #if defined(HAVE_FTIME)
   struct TIMEB t;
   ::FTIME(&t);
-  return (double)t.time + (double)t.millitm * (double)0.001;
+  return static_cast<double>(t.time) +
+    static_cast<double>(t.millitm) * static_cast<double>(0.001);
 #else /* !HAVE_FTIME */
   time_t secs;
   time(&secs);
-  return (double)secs;
+  return static_cast<double>(secs);
 #endif /* !HAVE_FTIME */
   }
 }
@@ -1246,7 +1247,7 @@ int SystemTools::EstimateFormatLength(const char *format, va_list ap)
       }
     }
   
-  return (int)length;
+  return static_cast<int>(length);
 }
 
 kwsys_stl::string SystemTools::EscapeChars(
diff --git a/Utilities/cmtar/block.c b/Utilities/cmtar/block.c
index e618d79..430eb20 100644
--- a/Utilities/cmtar/block.c
+++ b/Utilities/cmtar/block.c
@@ -24,7 +24,7 @@
 
 
 /* read a header block */
-int
+static int
 th_read_internal(TAR *t)
 {
   ssize_t i;
diff --git a/Utilities/cmtar/compat/strlcpy.c b/Utilities/cmtar/compat/strlcpy.c
index f85c71b..c10c283 100644
--- a/Utilities/cmtar/compat/strlcpy.c
+++ b/Utilities/cmtar/compat/strlcpy.c
@@ -39,10 +39,7 @@ static char *rcsid = "$OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp
  * will be copied.  Always NUL terminates (unless siz == 0).
  * Returns strlen(src); if retval >= siz, truncation occurred.
  */
-size_t strlcpy(dst, src, siz)
-  char *dst;
-  const char *src;
-  size_t siz;
+size_t strlcpy(char *dst, const char *src, size_t siz)
 {
   register char *d = dst;
   register const char *s = src;
diff --git a/Utilities/cmtar/libtar.c b/Utilities/cmtar/libtar.c
index fdeccf2..a4bd966 100644
--- a/Utilities/cmtar/libtar.c
+++ b/Utilities/cmtar/libtar.c
@@ -126,19 +126,19 @@ int libtar_gzopen(void* call_data, const char *pathname, int oflags, mode_t mode
   return fd;
 }
 
-int libtar_gzclose(void* call_data)
+static int libtar_gzclose(void* call_data)
 {
   struct gzStruct* gzf = (struct gzStruct*)call_data;
   return cm_zlib_gzclose(gzf->GZFile);
 }
 
-ssize_t libtar_gzread(void* call_data, void* buf, size_t count)
+static ssize_t libtar_gzread(void* call_data, void* buf, size_t count)
 {
   struct gzStruct* gzf = (struct gzStruct*)call_data;
   return cm_zlib_gzread(gzf->GZFile, buf, count);
 }
 
-ssize_t libtar_gzwrite(void* call_data, const void* buf, size_t count)
+static ssize_t libtar_gzwrite(void* call_data, const void* buf, size_t count)
 {
   struct gzStruct* gzf = (struct gzStruct*)call_data;
   return cm_zlib_gzwrite(gzf->GZFile, (void*)buf, count);
@@ -212,7 +212,7 @@ create(char *tarfile, char *rootdir, libtar_list_t *l)
 }
 
 
-int
+static int
 list(char *tarfile)
 {
   TAR *t;
@@ -272,7 +272,7 @@ list(char *tarfile)
 }
 
 
-int
+static int
 extract(char *tarfile, char *rootdir)
 {
   TAR *t;
@@ -316,7 +316,7 @@ extract(char *tarfile, char *rootdir)
 }
 
 
-void
+static void
 usage()
 {
   printf("Usage: %s [-C rootdir] [-g] [-z] -x|-t filename.tar\n",
diff --git a/Utilities/cmtar/listhash/list.c.in b/Utilities/cmtar/listhash/list.c.in
index 71c5bf6..e807f93 100644
--- a/Utilities/cmtar/listhash/list.c.in
+++ b/Utilities/cmtar/listhash/list.c.in
@@ -434,7 +434,8 @@ int
 /*
 ** @LISTHASH_PREFIX@_list_merge() - merge two lists into a new list
 */
-@LISTHASH_PREFIX@_list_t *
+/*
+static @LISTHASH_PREFIX@_list_t *
 @LISTHASH_PREFIX@_list_merge(@LISTHASH_PREFIX@_cmpfunc_t cmpfunc, int flags,
            @LISTHASH_PREFIX@_list_t *list1,
            @LISTHASH_PREFIX@_list_t *list2)
@@ -453,5 +454,6 @@ int
 
   return newlist;
 }
+*/