kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

COMP: Fix KWSys SharedForward sign conversion

Browse Source 
This uses size_t where necessary to avoid size_t/int conversion
warnings.
This commit is contained in:
Brad King 2009-07-08 15:09:16 -04:00
parent 4c0bbe3828
commit 6028f3a4c7
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/kwsys/SharedForward.h.in
View File

@ -147,6 +147,7 @@
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
/* Include needed system headers. */ /* Include needed system headers. */
#include <stddef.h> /* size_t */
#include <limits.h> #include <limits.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -550,7 +551,7 @@ static void kwsys_shared_forward_dirname(const char* begin, char* result)
else if(last_slash_index == 2 && begin[1] == ':') else if(last_slash_index == 2 && begin[1] == ':')
{ {
/* Only one leading drive letter and slash. */ /* Only one leading drive letter and slash. */
strncpy(result, begin, last_slash_index); strncpy(result, begin, (size_t)last_slash_index);
result[last_slash_index] = KWSYS_SHARED_FORWARD_PATH_SLASH; result[last_slash_index] = KWSYS_SHARED_FORWARD_PATH_SLASH;
result[last_slash_index+1] = 0; result[last_slash_index+1] = 0;
} }
@ -558,7 +559,7 @@ static void kwsys_shared_forward_dirname(const char* begin, char* result)
else else
{ {
/* A non-leading slash. */ /* A non-leading slash. */
strncpy(result, begin, last_slash_index); strncpy(result, begin, (size_t)last_slash_index);
result[last_slash_index] = 0; result[last_slash_index] = 0;
} }
} }
@ -630,7 +631,7 @@ static int kwsys_shared_forward_self_path(const char* argv0, char* result)
if(first < last) if(first < last)
{ {
/* Determine the length without trailing slash. */ /* Determine the length without trailing slash. */
int length = (int)(last-first); size_t length = (size_t)(last-first);
if(*(last-1) == '/' || *(last-1) == '\\') if(*(last-1) == '/' || *(last-1) == '\\')
{ {
--length; --length;