kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VC warning fixes

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4718 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lee Salzman
2009-11-08 01:08:53 +00:00
parent 9256ee374b
commit b28974415c
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/oggstream.cpp
+1 -1
View File
@@ -9,7 +9,7 @@
static size_t oggcallbackread(void *ptr, size_t size, size_t nmemb, void *datasource)
{
stream *s = (stream *)datasource;
return s ? s->read(ptr, size*nmemb)/size : 0;
return s ? s->read(ptr, int(size*nmemb))/size : 0;
}
static int oggcallbackseek(void *datasource, ogg_int64_t offset, int whence)
source/src/stream.cpp
+2 -2
View File
@@ -393,8 +393,8 @@ struct filestream : stream
bool end() { return feof(file)!=0; }
long tell() { return ftell(file); }
bool seek(long offset, int whence) { return fseek(file, offset, whence) >= 0; }
int read(void *buf, int len) { return fread(buf, 1, len, file); }
int write(const void *buf, int len) { return fwrite(buf, 1, len, file); }
int read(void *buf, int len) { return (int)fread(buf, 1, len, file); }
int write(const void *buf, int len) { return (int)fwrite(buf, 1, len, file); }
int getchar() { return fgetc(file); }
bool putchar(int c) { return fputc(c, file)!=EOF; }
bool getline(char *str, int len) { return fgets(str, len, file)!=NULL; }
source/src/tools.h
+1 -1
View File
@@ -705,7 +705,7 @@ struct stream
virtual int getchar() { uchar c; return read(&c, 1) == 1 ? c : -1; }
virtual bool putchar(int n) { uchar c = n; return write(&c, 1) == 1; }
virtual bool getline(char *str, int len);
virtual bool putstring(const char *str) { int len = strlen(str); return write(str, len) == len; }
virtual bool putstring(const char *str) { int len = (int)strlen(str); return write(str, len) == len; }
virtual bool putline(const char *str) { return putstring(str) && putchar('\n'); }
virtual int printf(const char *fmt, ...) { return -1; }
virtual uint getcrc() { return 0; }
source/src/zip.cpp
+5 -6
View File
@@ -210,7 +210,7 @@ static void mountzip(ziparchive &arch, vector<zipfile> &files, const char *mount
{
string packagesdir = "packages/";
path(packagesdir);
int striplen = stripdir ? strlen(stripdir) : 0;
int striplen = stripdir ? (int)strlen(stripdir) : 0;
if(!mountdir && !stripdir) loopv(files)
{
zipfile &f = files[i];
@@ -264,7 +264,7 @@ bool addzip(const char *name, const char *mount = NULL, const char *strip = NULL
string pname;
copystring(pname, name);
path(pname);
int plen = strlen(pname);
int plen = (int)strlen(pname);
if(plen < 4 || !strchr(&pname[plen-4], '.')) concatstring(pname, ".zip");
ziparchive *exists = findzip(pname);
@@ -356,9 +356,8 @@ struct zipstream : stream
if(fseek(arch->data, reading, SEEK_SET) >= 0) arch->owner = this;
else return;
}
else if(ftell(arch->data) != reading) *(int *)0 = 0;
uint remaining = info->offset + info->compressedsize - reading;
int n = arch->owner == this ? fread(zfile.next_in + zfile.avail_in, 1, min(size, remaining), arch->data) : 0;
int n = arch->owner == this ? (int)fread(zfile.next_in + zfile.avail_in, 1, min(size, remaining), arch->data) : 0;
zfile.avail_in += n;
reading += n;
}
@@ -484,7 +483,7 @@ struct zipstream : stream
arch->owner = this;
}
int n = fread(buf, 1, min(len, int(info->size + info->offset - reading)), arch->data);
int n = (int)fread(buf, 1, min(len, int(info->size + info->offset - reading)), arch->data);
reading += n;
if(n < len) stopreading();
return n;
@@ -526,7 +525,7 @@ stream *openzipfile(const char *name, const char *mode)
int listzipfiles(const char *dir, const char *ext, vector<char *> &files)
{
int extsize = ext ? (int)strlen(ext)+1 : 0, dirsize = strlen(dir), dirs = 0;
int extsize = ext ? (int)strlen(ext)+1 : 0, dirsize = (int)strlen(dir), dirs = 0;
loopvrev(archives)
{
ziparchive *arch = archives[i];