mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r22522) -Fix (r22489): (size_t)(uint32)(-1) != (size_t)-1

release/1.2
frosch 2011-05-29 18:35:31 +00:00
parent 36526d6b05
commit 615e435677
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/settings.cpp
View File

@ -97,10 +97,10 @@ static const char * const _list_group_names[] = {
* @param onelen force calculation of the *one parameter * @param onelen force calculation of the *one parameter
* @return the integer index of the full-list, or -1 if not found * @return the integer index of the full-list, or -1 if not found
*/ */
static int LookupOneOfMany(const char *many, const char *one, size_t onelen = 0) static size_t LookupOneOfMany(const char *many, const char *one, size_t onelen = 0)
{ {
const char *s; const char *s;
int idx; size_t idx;
if (onelen == 0) onelen = strlen(one); if (onelen == 0) onelen = strlen(one);
@ -113,7 +113,7 @@ static int LookupOneOfMany(const char *many, const char *one, size_t onelen = 0)
s = many; s = many;
while (*s != '|' && *s != 0) s++; while (*s != '|' && *s != 0) s++;
if ((size_t)(s - many) == onelen && !memcmp(one, many, onelen)) return idx; if ((size_t)(s - many) == onelen && !memcmp(one, many, onelen)) return idx;
if (*s == 0) return -1; if (*s == 0) return (size_t)-1;
many = s + 1; many = s + 1;
idx++; idx++;
} }
@ -126,11 +126,11 @@ static int LookupOneOfMany(const char *many, const char *one, size_t onelen = 0)
* of seperated by a whitespace,tab or | character * of seperated by a whitespace,tab or | character
* @return the 'fully' set integer, or -1 if a set is not found * @return the 'fully' set integer, or -1 if a set is not found
*/ */
static uint32 LookupManyOfMany(const char *many, const char *str) static size_t LookupManyOfMany(const char *many, const char *str)
{ {
const char *s; const char *s;
int r; size_t r;
uint32 res = 0; size_t res = 0;
for (;;) { for (;;) {
/* skip "whitespace" */ /* skip "whitespace" */
@ -141,7 +141,7 @@ static uint32 LookupManyOfMany(const char *many, const char *str)
while (*s != 0 && *s != ' ' && *s != '\t' && *s != '|') s++; while (*s != 0 && *s != ' ' && *s != '\t' && *s != '|') s++;
r = LookupOneOfMany(many, str, s - str); r = LookupOneOfMany(many, str, s - str);
if (r == -1) return (uint32)-1; if (r == (size_t)-1) return r;
SetBit(res, r); // value found, set it SetBit(res, r); // value found, set it
if (*s == 0) break; if (*s == 0) break;
@ -1059,7 +1059,7 @@ static bool CheckRoadSide(int p1)
* @param value that was read from config file * @param value that was read from config file
* @return the "hopefully" converted value * @return the "hopefully" converted value
*/ */
static int32 ConvertLandscape(const char *value) static size_t ConvertLandscape(const char *value)
{ {
/* try with the old values */ /* try with the old values */
return LookupOneOfMany("normal|hilly|desert|candy", value); return LookupOneOfMany("normal|hilly|desert|candy", value);

2
src/settings_internal.h
View File

@ -56,7 +56,7 @@ typedef SimpleTinyEnumT<SettingGuiFlagLong, uint16> SettingGuiFlag;
typedef bool OnChange(int32 var); ///< callback prototype on data modification typedef bool OnChange(int32 var); ///< callback prototype on data modification
typedef int32 OnConvert(const char *value); ///< callback prototype for convertion error typedef size_t OnConvert(const char *value); ///< callback prototype for convertion error
/** Properties of config file settings. */ /** Properties of config file settings. */
struct SettingDescBase { struct SettingDescBase {

2
src/table/settings.h.preamble
View File

@ -10,7 +10,7 @@
/** @file table/settings.h Settings to save in the savegame and config file. */ /** @file table/settings.h Settings to save in the savegame and config file. */
/* Callback function used in _settings[] as well as _company_settings[] */ /* Callback function used in _settings[] as well as _company_settings[] */
static int32 ConvertLandscape(const char *value); static size_t ConvertLandscape(const char *value);
/**************************** /****************************