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

(svn r21474) -Fix: some MSVC code analysis warnings in strgen

release/1.1
rubidium 2010-12-12 01:21:02 +00:00
parent 42dc2e63f2
commit d332c59a4c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/strgen/strgen.cpp
View File

@ -76,7 +76,7 @@ static LanguagePackHeader _lang; ///< Header information about a language.
static uint16 _hash_head[HASH_SIZE]; static uint16 _hash_head[HASH_SIZE];
static byte _put_buf[4096]; static byte _put_buf[4096];
static int _put_pos; static uint _put_pos;
static int _next_string_id; static int _next_string_id;
static uint32 _hash; static uint32 _hash;
@ -178,7 +178,7 @@ void NORETURN CDECL error(const char *s, ...)
static void PutByte(byte c) static void PutByte(byte c)
{ {
if (_put_pos == lengthof(_put_buf)) error("Put buffer too small"); if (_put_pos >= lengthof(_put_buf)) error("Put buffer too small");
_put_buf[_put_pos++] = c; _put_buf[_put_pos++] = c;
} }
@ -415,6 +415,7 @@ static uint ResolveCaseName(const char *str, uint len)
{ {
/* First get a clean copy of only the case name, then resolve it. */ /* First get a clean copy of only the case name, then resolve it. */
char case_str[CASE_GENDER_LEN]; char case_str[CASE_GENDER_LEN];
len = min(lengthof(case_str) - 1, len);
memcpy(case_str, str, len); memcpy(case_str, str, len);
case_str[len] = '\0'; case_str[len] = '\0';
@ -1124,7 +1125,7 @@ static void WriteLangfile(const char *filename)
/* Write each case */ /* Write each case */
for (c = casep; c != NULL; c = c->next) { for (c = casep; c != NULL; c = c->next) {
int pos; uint pos;
PutByte(c->caseidx); PutByte(c->caseidx);
/* Make some space for the 16-bit length */ /* Make some space for the 16-bit length */