From 2e1882389b5908d817a664bd617a5ffc2a8ddfa0 Mon Sep 17 00:00:00 2001 From: Andy Cedilnik Date: Wed, 12 Jul 2006 09:21:26 -0400 Subject: [PATCH] COMP: Remove warnings --- Source/kwsys/CommandLineArguments.cxx | 2 +- Source/kwsys/Glob.cxx | 2 +- Source/kwsys/Registry.cxx | 6 +++--- Source/kwsys/SystemTools.cxx | 13 +++++++------ Utilities/cmtar/block.c | 2 +- Utilities/cmtar/compat/strlcpy.c | 5 +---- Utilities/cmtar/libtar.c | 12 ++++++------ Utilities/cmtar/listhash/list.c.in | 4 +++- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Source/kwsys/CommandLineArguments.cxx b/Source/kwsys/CommandLineArguments.cxx index cdf254f7d..38061a5be 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(this->Internals->LastArgument + 1); } //---------------------------------------------------------------------------- diff --git a/Source/kwsys/Glob.cxx b/Source/kwsys/Glob.cxx index f39512645..15f0e7194 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(cc); } if ( cc > 0 && (expr[cc] == '[' || expr[cc] == '?' || expr[cc] == '*') && diff --git a/Source/kwsys/Registry.cxx b/Source/kwsys/Registry.cxx index b09898ade..685c50b47 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 06eccde12..1107fe510 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(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(NULL)) == 0) + return static_cast(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(t.time) + + static_cast(t.millitm) * static_cast(0.001); #else /* !HAVE_FTIME */ time_t secs; time(&secs); - return (double)secs; + return static_cast(secs); #endif /* !HAVE_FTIME */ } } @@ -1246,7 +1247,7 @@ int SystemTools::EstimateFormatLength(const char *format, va_list ap) } } - return (int)length; + return static_cast(length); } kwsys_stl::string SystemTools::EscapeChars( diff --git a/Utilities/cmtar/block.c b/Utilities/cmtar/block.c index e618d7914..430eb20c1 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 f85c71b02..c10c283f3 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 fdeccf21b..a4bd9661a 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 71c5bf604..e807f93a3 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; } +*/