Use int for FastOS_UNIX_Application::GetOpt() return value.

8 files changed, 8 insertions, 8 deletions

diff --git a/searchlib/src/apps/vespa-attribute-inspect/vespa-attribute-inspect.cpp b/searchlib/src/apps/vespa-attribute-inspect/vespa-attribute-inspect.cpp
index 6e5e3f75b5e..14584a46a04 100644
--- a/searchlib/src/apps/vespa-attribute-inspect/vespa-attribute-inspect.cpp
+++ b/searchlib/src/apps/vespa-attribute-inspect/vespa-attribute-inspect.cpp
@@ -113,7 +113,7 @@ LoadAttribute::Main()
     bool doHuge = false;
 
     int idx = 1;
-    char opt;
+    int opt;
     const char * arg;
     bool optError = false;
     while ((opt = GetOpt("pasf:h", arg, idx)) != -1) {
diff --git a/searchlib/src/apps/vespa-fileheader-inspect/vespa-fileheader-inspect.cpp b/searchlib/src/apps/vespa-fileheader-inspect/vespa-fileheader-inspect.cpp
index e512cfcdffb..d67946d29f1 100644
--- a/searchlib/src/apps/vespa-fileheader-inspect/vespa-fileheader-inspect.cpp
+++ b/searchlib/src/apps/vespa-fileheader-inspect/vespa-fileheader-inspect.cpp
@@ -57,7 +57,7 @@ Application::usage()
 int
 Application::parseOpts()
 {
-    char c = '?';
+    int c = '?';
     const char *optArg = NULL;
     int optInd = 0;
     while ((c = GetOpt("d:f:qh", optArg, optInd)) != -1) {
diff --git a/searchlib/src/tests/attribute/benchmark/attributebenchmark.cpp b/searchlib/src/tests/attribute/benchmark/attributebenchmark.cpp
index fc87e07a4e9..bf5233fd809 100644
--- a/searchlib/src/tests/attribute/benchmark/attributebenchmark.cpp
+++ b/searchlib/src/tests/attribute/benchmark/attributebenchmark.cpp
@@ -486,7 +486,7 @@ AttributeBenchmark::Main()
     dc._prefixSearch = false;
 
     int idx = 1;
-    char opt;
+    int opt;
     const char * arg;
     bool optError = false;
     while ((opt = GetOpt("n:u:v:s:q:p:r:c:l:h:i:a:e:S:E:D:L:bRPtw", arg, idx)) != -1) {
diff --git a/searchlib/src/tests/bitvector/bitvectorbenchmark.cpp b/searchlib/src/tests/bitvector/bitvectorbenchmark.cpp
index 17300125ed4..dc0dc646d77 100644
--- a/searchlib/src/tests/bitvector/bitvectorbenchmark.cpp
+++ b/searchlib/src/tests/bitvector/bitvectorbenchmark.cpp
@@ -168,7 +168,7 @@ int BitVectorBenchmark::Main()
     int idx = 1;
     std::string operation;
     size_t numBits(8*1000000);
-    char opt;
+    int opt;
     const char * arg;
     bool optError = false;
     while ((opt = GetOpt("n:t:", arg, idx)) != -1) {
diff --git a/searchlib/src/tests/diskindex/fieldwriter/fieldwriter_test.cpp b/searchlib/src/tests/diskindex/fieldwriter/fieldwriter_test.cpp
index 8755af9a133..ad0e3d88ad5 100644
--- a/searchlib/src/tests/diskindex/fieldwriter/fieldwriter_test.cpp
+++ b/searchlib/src/tests/diskindex/fieldwriter/fieldwriter_test.cpp
@@ -649,7 +649,7 @@ int
 FieldWriterTest::Main()
 {
     int argi;
-    char c;
+    int c;
     const char *optArg;
 
     if (_argc > 0) {
diff --git a/searchlib/src/tests/features/featurebenchmark.cpp b/searchlib/src/tests/features/featurebenchmark.cpp
index 6e1c5b1487c..72f693e72f4 100644
--- a/searchlib/src/tests/features/featurebenchmark.cpp
+++ b/searchlib/src/tests/features/featurebenchmark.cpp
@@ -597,7 +597,7 @@ Benchmark::Main()
     setup_search_features(_factory);
 
     int idx = 1;
-    char opt;
+    int opt;
     const char * arg;
     bool optError = false;
     vespalib::string file;
diff --git a/searchlib/src/tests/postinglistbm/postinglistbm.cpp b/searchlib/src/tests/postinglistbm/postinglistbm.cpp
index 695710873c4..7fa924f7002 100644
--- a/searchlib/src/tests/postinglistbm/postinglistbm.cpp
+++ b/searchlib/src/tests/postinglistbm/postinglistbm.cpp
@@ -110,7 +110,7 @@ int
 PostingListBM::Main()
 {
     int argi;
-    char c;
+    int c;
     const char *optArg;
 
     argi = 1;
diff --git a/searchlib/src/tests/transactionlogstress/translogstress.cpp b/searchlib/src/tests/transactionlogstress/translogstress.cpp
index 5792da7aa18..96772a0ee00 100644
--- a/searchlib/src/tests/transactionlogstress/translogstress.cpp
+++ b/searchlib/src/tests/transactionlogstress/translogstress.cpp
@@ -642,7 +642,7 @@ TransLogStress::Main()
     vespalib::duration sleepTime = 4s;
 
     int idx = 1;
-    char opt;
+    int opt;
     const char * arg;
     bool optError = false;
     while ((opt = GetOpt("d:p:t:f:s:v:c:e:g:i:a:b:h", arg, idx)) != -1) {