ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Patch by Magliocchetti Riccardo: 

fix some sign vs unsigned warnings casting signed variables / constants to unsigned types
This commit is contained in:
yabause 2008-11-10 22:09:39 +00:00
parent e74601884a
commit e46a6e093f
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
desmume/src/cflash.cpp
View File

@ -164,7 +164,7 @@ static void add_file(char *fname, FsEntry * entry, int fileLevel) {
for (; j<NAME_LEN; j++) for (; j<NAME_LEN; j++)
files[numFiles].name[j] = 0x20; files[numFiles].name[j] = 0x20;
for (j=0; j<EXT_LEN; j++) { for (j=0; j<EXT_LEN; j++) {
if ((j+i+1)>=strlen(fname)) break; if ((size_t)(j+i+1)>=strlen(fname)) break;
files[numFiles].ext[j] = fname[j+i+1]; files[numFiles].ext[j] = fname[j+i+1];
} }
for (; j<3; j++) for (; j<3; j++)
@ -184,7 +184,7 @@ static void add_file(char *fname, FsEntry * entry, int fileLevel) {
n = 0; n = 0;
j = 13; j = 13;
for (i=0; i<strlen(entry->cFileName); i++) { for (i=0; (size_t)i<strlen(entry->cFileName); i++) {
if (j == 13) { if (j == 13) {
n++; n++;
p = (char*)&files[numFiles-n].name[0]; p = (char*)&files[numFiles-n].name[0];
@ -213,7 +213,7 @@ static void add_file(char *fname, FsEntry * entry, int fileLevel) {
for (; j<NAME_LEN; j++) for (; j<NAME_LEN; j++)
files[numFiles].name[j] = 0x20; files[numFiles].name[j] = 0x20;
for (j=0; j<EXT_LEN; j++) { for (j=0; j<EXT_LEN; j++) {
if ((j+i+1)>=strlen(fname)) break; if ((size_t)(j+i+1)>=strlen(fname)) break;
files[numFiles].ext[j] = fname[j+i+1]; files[numFiles].ext[j] = fname[j+i+1];
} }
for (; j<3; j++) for (; j<3; j++)
@ -795,7 +795,7 @@ cflash_write(unsigned int address,unsigned int data) {
WRITE_FN( disk_image, &sector_data[written], 512 - written); WRITE_FN( disk_image, &sector_data[written], 512 - written);
written += cur_write; written += cur_write;
if ( cur_write == -1) { if ( cur_write == (size_t)-1) {
break; break;
} }
} }

2
desmume/src/memorystream.h
View File

@ -186,7 +186,7 @@ private:
throw new std::runtime_error("memory_streambuf is not expandable"); throw new std::runtime_error("memory_streambuf is not expandable");
size_t newcapacity; size_t newcapacity;
if(upto == -1) if(upto == (size_t)-1)
newcapacity = capacity + capacity/2 + 2; newcapacity = capacity + capacity/2 + 2;
else else
newcapacity = std::max(upto,capacity); newcapacity = std::max(upto,capacity);

2
desmume/src/saves.cpp
View File

@ -674,7 +674,7 @@ static bool savestate_save(std::ostream* outstream, int compressionLevel)
write32le(len,outstream); //uncompressed length write32le(len,outstream); //uncompressed length
write32le(comprlen,outstream); //compressed length (-1 if it is not compressed) write32le(comprlen,outstream); //compressed length (-1 if it is not compressed)
outstream->write((char*)cbuf,comprlen==-1?len:comprlen); outstream->write((char*)cbuf,comprlen==(u32)-1?len:comprlen);
if(cbuf != (uint8*)ms.buf()) delete[] cbuf; if(cbuf != (uint8*)ms.buf()) delete[] cbuf;
#ifdef HAVE_LIBZ #ifdef HAVE_LIBZ
return error == Z_OK; return error == Z_OK;