mirror of
https://github.com/Kitware/CMake.git
synced 2025-10-14 02:08:27 +08:00
Fix or cast more integer conversions in cmake
These were revealed by GCC's -Wconversion option. Fix types where it is easy to do so. Cast in cases we know the integer will not be truncated.
This commit is contained in:
@@ -53,13 +53,13 @@ void cmCursesLongMessageForm::UpdateStatusBar()
|
||||
getmaxyx(stdscr, y, x);
|
||||
|
||||
char bar[cmCursesMainForm::MAX_WIDTH];
|
||||
int size = strlen(this->Title.c_str());
|
||||
size_t size = strlen(this->Title.c_str());
|
||||
if ( size >= cmCursesMainForm::MAX_WIDTH )
|
||||
{
|
||||
size = cmCursesMainForm::MAX_WIDTH-1;
|
||||
}
|
||||
strncpy(bar, this->Title.c_str(), size);
|
||||
for(int i=size-1; i<cmCursesMainForm::MAX_WIDTH; i++) bar[i] = ' ';
|
||||
for(size_t i=size-1; i<cmCursesMainForm::MAX_WIDTH; i++) bar[i] = ' ';
|
||||
|
||||
int width;
|
||||
if (x < cmCursesMainForm::MAX_WIDTH )
|
||||
@@ -76,8 +76,8 @@ void cmCursesLongMessageForm::UpdateStatusBar()
|
||||
char version[cmCursesMainForm::MAX_WIDTH];
|
||||
char vertmp[128];
|
||||
sprintf(vertmp,"CMake Version %s", cmVersion::GetCMakeVersion());
|
||||
int sideSpace = (width-strlen(vertmp));
|
||||
for(int i=0; i<sideSpace; i++) { version[i] = ' '; }
|
||||
size_t sideSpace = (width-strlen(vertmp));
|
||||
for(size_t i=0; i<sideSpace; i++) { version[i] = ' '; }
|
||||
sprintf(version+sideSpace, "%s", vertmp);
|
||||
version[width] = '\0';
|
||||
|
||||
|
Reference in New Issue
Block a user