(svn r5974) -Codechange: added casts all around the place to make Windows 64bit happy (michi_cc)
--- a/bmp.c Sun Aug 20 12:07:27 2006 +0000
+++ b/bmp.c Sun Aug 20 12:09:32 2006 +0000
@@ -15,7 +15,7 @@
static inline void AdvanceBuffer(BmpBuffer *buffer)
{
- buffer->read = fread(buffer->data, 1, BMP_BUFFER_SIZE, buffer->file);
+ buffer->read = (int)fread(buffer->data, 1, BMP_BUFFER_SIZE, buffer->file);
buffer->pos = 0;
}
--- a/console.c Sun Aug 20 12:07:27 2006 +0000
+++ b/console.c Sun Aug 20 12:09:32 2006 +0000
@@ -680,7 +680,7 @@
/** copy in an argument into the aliasstream */
static inline int IConsoleCopyInParams(char *dst, const char *src, uint bufpos)
{
- int len = min(ICON_MAX_STREAMSIZE - bufpos, strlen(src));
+ int len = min(ICON_MAX_STREAMSIZE - bufpos, (int)strlen(src));
strncpy(dst, src, len);
return len;
--- a/misc.c Sun Aug 20 12:07:27 2006 +0000
+++ b/misc.c Sun Aug 20 12:09:32 2006 +0000
@@ -253,7 +253,7 @@
for (i = 0; i != lengthof(_name_array); ++i) {
if (_name_array[i][0] != '\0') {
SlSetArrayIndex(i);
- SlArray(_name_array[i], strlen(_name_array[i]), SLE_UINT8);
+ SlArray(_name_array[i], (uint)strlen(_name_array[i]), SLE_UINT8);
}
}
}
--- a/namegen.c Sun Aug 20 12:07:27 2006 +0000
+++ b/namegen.c Sun Aug 20 12:09:32 2006 +0000
@@ -475,7 +475,7 @@
if (do_prefix) {
CzechPattern pattern = name_czech_adj[prefix].pattern;
- int endpos;
+ size_t endpos;
strcat(buf, name_czech_adj[prefix].name);
endpos = strlen(buf) - 1;
@@ -496,7 +496,7 @@
if (postfix < lengthof(name_czech_subst_postfix)) {
const char *poststr = name_czech_subst_postfix[postfix];
const char *endstr = name_czech_subst_ending[ending].name;
- int postlen, endlen;
+ size_t postlen, endlen;
postlen = strlen(poststr);
endlen = strlen(endstr);
@@ -507,7 +507,7 @@
(poststr[1] != 'v' || poststr[1] != endstr[1]) &&
poststr[2] != endstr[1])
) {
- uint buflen;
+ size_t buflen;
strcat(buf, poststr);
buflen = strlen(buf);
--- a/network_server.c Sun Aug 20 12:07:27 2006 +0000
+++ b/network_server.c Sun Aug 20 12:09:32 2006 +0000
@@ -313,7 +313,7 @@
for (i = 0; i < sent_packets; i++) {
Packet *p = NetworkSend_Init(PACKET_SERVER_MAP);
NetworkSend_uint8(p, MAP_PACKET_NORMAL);
- res = fread(p->buffer + p->size, 1, SEND_MTU - p->size, file_pointer);
+ res = (int)fread(p->buffer + p->size, 1, SEND_MTU - p->size, file_pointer);
if (ferror(file_pointer)) {
error("Error reading temporary network savegame!");
}
--- a/newgrf.c Sun Aug 20 12:07:27 2006 +0000
+++ b/newgrf.c Sun Aug 20 12:09:32 2006 +0000
@@ -1876,7 +1876,7 @@
}
}
name += ofs;
- len -= ofs;
+ len -= (int)ofs;
}
}
--- a/oldloader.c Sun Aug 20 12:07:27 2006 +0000
+++ b/oldloader.c Sun Aug 20 12:09:32 2006 +0000
@@ -120,7 +120,7 @@
and just return a byte per time */
if (ls->buffer_cur >= ls->buffer_count) {
/* Read some new bytes from the file */
- int count = fread(ls->buffer, 1, BUFFER_SIZE, ls->file);
+ int count = (int)fread(ls->buffer, 1, BUFFER_SIZE, ls->file);
/* We tried to read, but there is nothing in the file anymore.. */
if (count == 0) {
@@ -376,7 +376,7 @@
* - OCL_CHUNK: load an other proc to load a part of the savegame, 'amount' times
* - OCL_ASSERT: to check if we are really at the place we expect to be.. because old savegames are too binary to be sure ;)
*/
-#define OCL_SVAR(type, base, offset) { type, 1, NULL, offsetof(base, offset), NULL }
+#define OCL_SVAR(type, base, offset) { type, 1, NULL, (uint)offsetof(base, offset), NULL }
#define OCL_VAR(type, amount, pointer) { type, amount, pointer, 0, NULL }
#define OCL_END() { OC_END, 0, NULL, 0, NULL }
#define OCL_NULL(amount) { OC_NULL, amount, NULL, 0, NULL }
--- a/players.c Sun Aug 20 12:07:27 2006 +0000
+++ b/players.c Sun Aug 20 12:09:32 2006 +0000
@@ -1065,7 +1065,7 @@
for (i = 0; i < LAST_HS_ITEM; i++) { // don't save network highscores
for (hs = _highscore_table[i]; hs != endof(_highscore_table[i]); hs++) {
/* First character is a command character, so strlen will fail on that */
- byte length = min(sizeof(hs->company), (hs->company[0] == '\0') ? 0 : strlen(&hs->company[1]) + 1);
+ byte length = min(sizeof(hs->company), (hs->company[0] == '\0') ? 0 : (int)strlen(&hs->company[1]) + 1);
fwrite(&length, sizeof(length), 1, fp); // write away string length
fwrite(hs->company, length, 1, fp);
--- a/spritecache.c Sun Aug 20 12:07:27 2006 +0000
+++ b/spritecache.c Sun Aug 20 12:09:32 2006 +0000
@@ -192,7 +192,7 @@
static uint32 GetSpriteCacheUsage(void)
{
- size_t tot_size = 0;
+ uint32 tot_size = 0;
MemBlock* s;
for (s = _spritecache_ptr; s->size != 0; s = NextBlock(s))
--- a/strings.c Sun Aug 20 12:07:27 2006 +0000
+++ b/strings.c Sun Aug 20 12:09:32 2006 +0000
@@ -1229,7 +1229,7 @@
// go through the language files and make sure that they are valid.
for (i = m = 0; i != n; i++) {
- int j;
+ size_t j;
char *s = str_fmt("%s%s", _path.lang_dir, files[i]);
in = fopen(s, "rb");
--- a/win32.c Sun Aug 20 12:07:27 2006 +0000
+++ b/win32.c Sun Aug 20 12:09:32 2006 +0000
@@ -265,7 +265,7 @@
http = _wininet.HttpOpenRequest(conn, "POST", buff, NULL, NULL, NULL, INTERNET_FLAG_NO_CACHE_WRITE , 0);
if (http == NULL) { err = "httpopenrequest failed"; goto error3; }
- if (!_wininet.HttpSendRequest(http, "Content-type: application/binary", -1, msg, msglen)) { err = "httpsendrequest failed"; goto error4; }
+ if (!_wininet.HttpSendRequest(http, "Content-type: application/binary", -1, msg, (DWORD)msglen)) { err = "httpsendrequest failed"; goto error4; }
len = sizeof(code);
if (!_wininet.HttpQueryInfo(http, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &code, &len, 0)) { err = "httpqueryinfo failed"; goto error4; }