From 319c399d61497d2e6dbca0ffae8d5d2a2d72d866 Mon Sep 17 00:00:00 2001 From: Murai Takashi Date: Wed, 17 Jul 2019 20:31:12 +0900 Subject: [PATCH] PVS V739: EOF compared with a value of the char type. Change-Id: Icfaff590359381fbdd3bbd7993dab92111da3ed1 Reviewed-on: https://review.haiku-os.org/c/1618 Reviewed-by: waddlesplash --- headers/private/shared/SettingsHandler.h | 2 +- src/bin/multiuser/login.cpp | 2 +- src/kits/shared/SettingsHandler.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/headers/private/shared/SettingsHandler.h b/headers/private/shared/SettingsHandler.h index 0b84034ef2..ad6d222031 100644 --- a/headers/private/shared/SettingsHandler.h +++ b/headers/private/shared/SettingsHandler.h @@ -71,7 +71,7 @@ private: status_t EachArgvPrivate(const char* name, ArgvHandler argvHandlerFunc, void* passThru); - char GetCh(); + int GetCh(); status_t SendArgv(ArgvHandler argvHandlerFunc, void* passThru); // done with a whole line of argv, send it off and get ready diff --git a/src/bin/multiuser/login.cpp b/src/bin/multiuser/login.cpp index 416daea353..36c8eff84c 100644 --- a/src/bin/multiuser/login.cpp +++ b/src/bin/multiuser/login.cpp @@ -34,7 +34,7 @@ read_string(char* string, size_t bufferSize) // TODO: setup timeout handler // read everything until the next carriage return - char c; + int c; while ((c = fgetc(stdin)) != EOF && c != '\r' && c != '\n') { if (bufferSize > 1) { string[0] = c; diff --git a/src/kits/shared/SettingsHandler.cpp b/src/kits/shared/SettingsHandler.cpp index 0570785f5a..f73615acfe 100644 --- a/src/kits/shared/SettingsHandler.cpp +++ b/src/kits/shared/SettingsHandler.cpp @@ -153,7 +153,7 @@ ArgvParser::NextArgvIfNotEmpty() } -char +int ArgvParser::GetCh() { if (fPos < 0 || fBuffer[fPos] == 0) { @@ -185,7 +185,7 @@ ArgvParser::EachArgvPrivate(const char* name, ArgvHandler argvHandlerFunc, status_t result; for (;;) { - char ch = GetCh(); + int ch = GetCh(); if (ch == EOF) { // done with fFile if (fInDoubleQuote || fInSingleQuote) {