Fix bad signed/unsigned comparisons
Either by casting, or switching to a more appropriate type
for the variable.
diff --git a/vncviewer/CConn.cxx b/vncviewer/CConn.cxx
index cf4f31b..5935c17 100644
--- a/vncviewer/CConn.cxx
+++ b/vncviewer/CConn.cxx
@@ -134,7 +134,7 @@
{
OptionsDialog::removeCallback(handleOptions);
- for (int i = 0; i < sizeof(decoders)/sizeof(decoders[0]); i++)
+ for (size_t i = 0; i < sizeof(decoders)/sizeof(decoders[0]); i++)
delete decoders[i];
if (desktop)
diff --git a/vncviewer/cocoa.mm b/vncviewer/cocoa.mm
index 0992100..e51cba9 100644
--- a/vncviewer/cocoa.mm
+++ b/vncviewer/cocoa.mm
@@ -57,7 +57,7 @@
if (CGGetActiveDisplayList(16, displays, &count) != kCGErrorSuccess)
return 1;
- if (count != Fl::screen_count())
+ if (count != (unsigned)Fl::screen_count())
return 1;
#ifdef HAVE_FLTK_FULLSCREEN_SCREENS
@@ -424,7 +424,7 @@
NSEvent *nsevent;
UInt16 key_code;
- int i;
+ size_t i;
NSString *chars;
UInt32 modifiers;
diff --git a/vncviewer/parameters.cxx b/vncviewer/parameters.cxx
index 184af08..29a5397 100644
--- a/vncviewer/parameters.cxx
+++ b/vncviewer/parameters.cxx
@@ -202,7 +202,7 @@
} else {
- for (int j = 0; j < sizeof(replaceMap)/sizeof(replaceMap[0]); j++) {
+ for (size_t j = 0; j < sizeof(replaceMap)/sizeof(replaceMap[0]); j++) {
if (val[i] == replaceMap[j].first) {
dest[pos] = '\\';
@@ -242,7 +242,7 @@
// Check for escape sequences
if (val[i] == '\\') {
- for (int j = 0; j < sizeof(replaceMap)/sizeof(replaceMap[0]); j++) {
+ for (size_t j = 0; j < sizeof(replaceMap)/sizeof(replaceMap[0]); j++) {
if (val[i+1] == replaceMap[j].second) {
dest[pos] = replaceMap[j].first;
escapedCharacter = true;
@@ -413,7 +413,7 @@
setKeyString("ServerName", servername, &hKey);
- for (int i = 0; i < sizeof(parameterArray)/sizeof(VoidParameter*); i++) {
+ for (size_t i = 0; i < sizeof(parameterArray)/sizeof(VoidParameter*); i++) {
if (dynamic_cast<StringParameter*>(parameterArray[i]) != NULL) {
setKeyString(parameterArray[i]->getName(), *(StringParameter*)parameterArray[i], &hKey);
} else if (dynamic_cast<IntParameter*>(parameterArray[i]) != NULL) {
@@ -459,7 +459,7 @@
int intValue = 0;
char stringValue[buffersize];
- for (int i = 0; i < sizeof(parameterArray)/sizeof(VoidParameter*); i++) {
+ for (size_t i = 0; i < sizeof(parameterArray)/sizeof(VoidParameter*); i++) {
if (dynamic_cast<StringParameter*>(parameterArray[i]) != NULL) {
if (getKeyString(parameterArray[i]->getName(), stringValue, buffersize, &hKey))
parameterArray[i]->setParam(stringValue);
@@ -523,7 +523,7 @@
if (encodeValue(servername, encodingBuffer, buffersize))
fprintf(f, "ServerName=%s\n", encodingBuffer);
- for (int i = 0; i < sizeof(parameterArray)/sizeof(VoidParameter*); i++) {
+ for (size_t i = 0; i < sizeof(parameterArray)/sizeof(VoidParameter*); i++) {
if (dynamic_cast<StringParameter*>(parameterArray[i]) != NULL) {
if (encodeValue(*(StringParameter*)parameterArray[i], encodingBuffer, buffersize))
fprintf(f, "%s=%s\n", ((StringParameter*)parameterArray[i])->getName(), encodingBuffer);
@@ -635,7 +635,7 @@
} else {
// Find and set the correct parameter
- for (int i = 0; i < sizeof(parameterArray)/sizeof(VoidParameter*); i++) {
+ for (size_t i = 0; i < sizeof(parameterArray)/sizeof(VoidParameter*); i++) {
if (dynamic_cast<StringParameter*>(parameterArray[i]) != NULL) {
if (strcasecmp(line, ((StringParameter*)parameterArray[i])->getName()) == 0) {