From e48a351f8e006b19d9e2c7bf9ef672a1e141d85f Mon Sep 17 00:00:00 2001 From: glx Date: Thu, 8 May 2008 13:20:54 +0000 Subject: (svn r13008) -Fix [FS#1997]: silence some MSVC x64 warnings --- src/fileio.cpp | 10 +++---- src/fileio.h | 6 ++--- src/network/network_gui.cpp | 6 ++--- src/network/network_udp.cpp | 2 +- src/newgrf.cpp | 66 ++++++++++++++++++++++----------------------- src/newgrf_config.cpp | 2 +- src/settings.cpp | 24 ++++++++--------- src/spritecache.cpp | 2 +- src/string_func.h | 4 +-- src/vehicle.cpp | 2 +- src/win32.cpp | 5 ++-- 11 files changed, 64 insertions(+), 65 deletions(-) (limited to 'src') diff --git a/src/fileio.cpp b/src/fileio.cpp index b28a27a6b..7fbb3789a 100644 --- a/src/fileio.cpp +++ b/src/fileio.cpp @@ -27,7 +27,7 @@ struct Fio { byte *buffer, *buffer_end; ///< position pointer in local buffer and last valid byte of buffer - uint32 pos; ///< current (system) position in file + size_t pos; ///< current (system) position in file FILE *cur_fh; ///< current file handle const char *filename; ///< current filename FILE *handles[MAX_FILE_SLOTS]; ///< array of file handles we can have open @@ -125,7 +125,7 @@ uint32 FioReadDword() return (FioReadWord() << 16) | b; } -void FioReadBlock(void *ptr, uint size) +void FioReadBlock(void *ptr, size_t size) { FioSeekTo(FioGetPos(), SEEK_SET); _fio.pos += fread(ptr, 1, size, _fio.cur_fh); @@ -480,7 +480,7 @@ static bool TarListAddFile(const char *filename) TarHeader th; char buf[sizeof(th.name) + 1], *end; char name[sizeof(th.prefix) + 1 + sizeof(th.name) + 1]; - int num = 0, pos = 0; + size_t num = 0, pos = 0; /* Make a char of 512 empty bytes */ char empty[512]; @@ -499,7 +499,7 @@ static bool TarListAddFile(const char *filename) } name[0] = '\0'; - int len = 0; + size_t len = 0; /* The prefix contains the directory-name */ if (th.prefix[0] != '\0') { @@ -550,7 +550,7 @@ static bool TarListAddFile(const char *filename) return true; } -static int ScanPathForTarFiles(const char *path, int basepath_length) +static int ScanPathForTarFiles(const char *path, size_t basepath_length) { extern bool FiosIsValidFile(const char *path, const struct dirent *ent, struct stat *sb); diff --git a/src/fileio.h b/src/fileio.h index 881c983f3..ed2a8b506 100644 --- a/src/fileio.h +++ b/src/fileio.h @@ -18,7 +18,7 @@ uint16 FioReadWord(); uint32 FioReadDword(); void FioCloseAll(); void FioOpenFile(int slot, const char *filename); -void FioReadBlock(void *ptr, uint size); +void FioReadBlock(void *ptr, size_t size); void FioSkipBytes(int n); void FioCreateDirectory(const char *filename); @@ -70,8 +70,8 @@ struct TarListEntry { }; struct TarFileListEntry { TarListEntry *tar; - int size; - int position; + size_t size; + size_t position; }; typedef std::map TarList; typedef std::map TarFileList; diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp index 569db534b..8dd90d37d 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -1778,7 +1778,7 @@ static void ChatTabCompletion(Window *w) { static char _chat_tab_completion_buf[lengthof(_edit_str_net_buf)]; Textbuf *tb = &WP(w, chatquerystr_d).text; - uint len, tb_len; + size_t len, tb_len; uint item; char *tb_buf, *pre_buf; const char *cur_name; @@ -1799,8 +1799,8 @@ static void ChatTabCompletion(Window *w) /* We are pressing TAB again on the same name, is there an other name * that starts with this? */ if (!second_scan) { - uint offset; - uint length; + size_t offset; + size_t length; /* If we are completing at the begin of the line, skip the ': ' we added */ if (tb_buf == pre_buf) { diff --git a/src/network/network_udp.cpp b/src/network/network_udp.cpp index 302100823..636bf67fb 100644 --- a/src/network/network_udp.cpp +++ b/src/network/network_udp.cpp @@ -205,7 +205,7 @@ DEF_UDP_RECEIVE_COMMAND(Server, PACKET_UDP_CLIENT_GET_NEWGRFS) const GRFConfig *in_reply[NETWORK_MAX_GRF_COUNT]; uint8 in_reply_count = 0; - uint packet_len = 0; + size_t packet_len = 0; DEBUG(net, 6, "[udp] newgrf data request from %s:%d", inet_ntoa(client_addr->sin_addr), ntohs(client_addr->sin_port)); diff --git a/src/newgrf.cpp b/src/newgrf.cpp index cf050e455..4567e7ae3 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -96,7 +96,7 @@ static byte _grf_data_blocks; static GrfDataType _grf_data_type; -typedef void (*SpecialSpriteHandler)(byte *buf, int len); +typedef void (*SpecialSpriteHandler)(byte *buf, size_t len); enum { MAX_STATIONS = 256, @@ -152,7 +152,7 @@ void CDECL grfmsg(int severity, const char *str, ...) DEBUG(grf, severity, "[%s:%d] %s", _cur_grfconfig->filename, _nfo_line, buf); } -static inline bool check_length(int real, int wanted, const char *str) +static inline bool check_length(size_t real, size_t wanted, const char *str) { if (real >= wanted) return true; grfmsg(0, "%s: Invalid pseudo sprite length %d (expected %d)!", str, real, wanted); @@ -2248,7 +2248,7 @@ static bool IndustriesChangeInfo(uint indid, int numinfo, int prop, byte **bufp, } /* Action 0x00 */ -static void FeatureChangeInfo(byte *buf, int len) +static void FeatureChangeInfo(byte *buf, size_t len) { byte *bufend = buf + len; @@ -2363,7 +2363,7 @@ static void FeatureChangeInfo(byte *buf, int len) } /* Action 0x00 (GLS_SAFETYSCAN) */ -static void SafeChangeInfo(byte *buf, int len) +static void SafeChangeInfo(byte *buf, size_t len) { if (!check_length(len, 6, "SafeChangeInfo")) return; buf++; @@ -2386,7 +2386,7 @@ static void SafeChangeInfo(byte *buf, int len) } /* Action 0x00 (GLS_RESERVE) */ -static void ReserveChangeInfo(byte *buf, int len) +static void ReserveChangeInfo(byte *buf, size_t len) { byte *bufend = buf + len; @@ -2482,7 +2482,7 @@ static const SpriteGroup* NewResultSpriteGroup(SpriteID sprite, byte num_sprites } /* Action 0x01 */ -static void NewSpriteSet(byte *buf, int len) +static void NewSpriteSet(byte *buf, size_t len) { /* <01> * @@ -2518,7 +2518,7 @@ static void NewSpriteSet(byte *buf, int len) } /* Action 0x01 (SKIP) */ -static void SkipAct1(byte *buf, int len) +static void SkipAct1(byte *buf, size_t len) { if (!check_length(len, 4, "SkipAct1")) return; buf++; @@ -2577,7 +2577,7 @@ static const SpriteGroup* CreateGroupFromGroupID(byte feature, byte setid, byte } /* Action 0x02 */ -static void NewSpriteGroup(byte *buf, int len) +static void NewSpriteGroup(byte *buf, size_t len) { /* <02> * @@ -3182,7 +3182,7 @@ static void CargoMapSpriteGroup(byte *buf, uint8 idcount, uint8 cidcount) /* Action 0x03 */ -static void FeatureMapSpriteGroup(byte *buf, int len) +static void FeatureMapSpriteGroup(byte *buf, size_t len) { /* <03> ... [ ]... * id-list := [] [id-list] @@ -3267,7 +3267,7 @@ static void FeatureMapSpriteGroup(byte *buf, int len) } /* Action 0x04 */ -static void FeatureNewName(byte *buf, int len) +static void FeatureNewName(byte *buf, size_t len) { /* <04> * @@ -3421,7 +3421,7 @@ static uint16 SanitizeSpriteOffset(uint16& num, uint16 offset, int max_sprites, } /* Action 0x05 */ -static void GraphicsNew(byte *buf, int len) +static void GraphicsNew(byte *buf, size_t len) { /* <05> * @@ -3535,7 +3535,7 @@ static void GraphicsNew(byte *buf, int len) } /* Action 0x05 (SKIP) */ -static void SkipAct5(byte *buf, int len) +static void SkipAct5(byte *buf, size_t len) { if (!check_length(len, 2, "SkipAct5")) return; buf++; @@ -3711,7 +3711,7 @@ static uint32 GetParamVal(byte param, uint32 *cond_val) } /* Action 0x06 */ -static void CfgApply(byte *buf, int len) +static void CfgApply(byte *buf, size_t len) { /* <06> ... * @@ -3799,7 +3799,7 @@ static void CfgApply(byte *buf, int len) /* Action 0x07 */ /* Action 0x09 */ -static void SkipIf(byte *buf, int len) +static void SkipIf(byte *buf, size_t len) { /* <07/09> * @@ -3954,7 +3954,7 @@ static void SkipIf(byte *buf, int len) /* Action 0x08 (GLS_FILESCAN) */ -static void ScanInfo(byte *buf, int len) +static void ScanInfo(byte *buf, size_t len) { if (!check_length(len, 8, "Info")) return; buf++; @@ -3981,7 +3981,7 @@ static void ScanInfo(byte *buf, int len) } /* Action 0x08 */ -static void GRFInfo(byte *buf, int len) +static void GRFInfo(byte *buf, size_t len) { /* <08> * @@ -4005,7 +4005,7 @@ static void GRFInfo(byte *buf, int len) } /* Action 0x0A */ -static void SpriteReplace(byte *buf, int len) +static void SpriteReplace(byte *buf, size_t len) { /* <0A> [ ...] * : @@ -4041,7 +4041,7 @@ static void SpriteReplace(byte *buf, int len) } /* Action 0x0A (SKIP) */ -static void SkipActA(byte *buf, int len) +static void SkipActA(byte *buf, size_t len) { buf++; uint8 num_sets = grf_load_byte(&buf); @@ -4057,7 +4057,7 @@ static void SkipActA(byte *buf, int len) } /* Action 0x0B */ -static void GRFLoadError(byte *buf, int len) +static void GRFLoadError(byte *buf, size_t len) { /* <0B> [ 00] [] 00 [] * @@ -4167,7 +4167,7 @@ static void GRFLoadError(byte *buf, int len) } /* Action 0x0C */ -static void GRFComment(byte *buf, int len) +static void GRFComment(byte *buf, size_t len) { /* <0C> [] * @@ -4175,13 +4175,13 @@ static void GRFComment(byte *buf, int len) if (len == 1) return; - int text_len = len - 1; + size_t text_len = len - 1; const char *text = (const char*)(buf + 1); grfmsg(2, "GRFComment: %.*s", text_len, text); } /* Action 0x0D (GLS_SAFETYSCAN) */ -static void SafeParamSet(byte *buf, int len) +static void SafeParamSet(byte *buf, size_t len) { if (!check_length(len, 5, "SafeParamSet")) return; buf++; @@ -4313,7 +4313,7 @@ static uint32 PerformGRM(uint32 *grm, uint16 num_ids, uint16 count, uint8 op, ui /* Action 0x0D */ -static void ParamSet(byte *buf, int len) +static void ParamSet(byte *buf, size_t len) { /* <0D> [] * @@ -4604,7 +4604,7 @@ static void ParamSet(byte *buf, int len) } /* Action 0x0E (GLS_SAFETYSCAN) */ -static void SafeGRFInhibit(byte *buf, int len) +static void SafeGRFInhibit(byte *buf, size_t len) { /* <0E> * @@ -4632,7 +4632,7 @@ static void SafeGRFInhibit(byte *buf, int len) } /* Action 0x0E */ -static void GRFInhibit(byte *buf, int len) +static void GRFInhibit(byte *buf, size_t len) { /* <0E> * @@ -4657,7 +4657,7 @@ static void GRFInhibit(byte *buf, int len) } /* Action 0x0F */ -static void FeatureTownName(byte *buf, int len) +static void FeatureTownName(byte *buf, size_t len) { /* <0F> * @@ -4757,7 +4757,7 @@ static void FeatureTownName(byte *buf, int len) } /* Action 0x10 */ -static void DefineGotoLabel(byte *buf, int len) +static void DefineGotoLabel(byte *buf, size_t len) { /* <10>