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

[build] Fix warnings in src/common 

Bug: #1003
This commit is contained in:
Fabrice de Gans 2022-09-24 22:36:05 -07:00 committed by Rafael Kitover
parent b2ec1544be
commit 1e1451c57f
4 changed files with 41 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/ConfigManager.cpp
View File

@ -704,16 +704,16 @@ const char* FindConfigFile(const char *name)
if (!strchr(arg0, '/') &&
!strchr(arg0, '\\')) {
char *path = getenv("PATH");
char *env_path = getenv("PATH");
if (path != NULL) {
strncpy(buffer, path, 4096);
if (env_path != NULL) {
strncpy(buffer, env_path, 4096);
buffer[4095] = 0;
char *tok = strtok(buffer, PATH_SEP);
while (tok) {
sprintf(path, "%s%c%s", tok, FILE_SEP, EXE_NAME);
if (FileExists(path)) {
sprintf(env_path, "%s%c%s", tok, FILE_SEP, EXE_NAME);
if (FileExists(env_path)) {
static char path2[2048];
sprintf(path2, "%s%c%s", tok, FILE_SEP, name);
if (FileExists(path2)) {
@ -1157,7 +1157,7 @@ int ReadOpts(int argc, char ** argv)
case OPT_SOUND_FILTERING:
// --sound-filtering
if (optarg) {
soundFiltering = atoi(optarg);
soundFiltering = (float)(atoi(optarg));
}
break;

47
src/common/Patch.cpp
View File

@ -1,6 +1,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "zconf.h"
#ifndef __LIBRETRO__
#include <zlib.h>
#endif
@ -112,7 +113,7 @@ static int64_t readVarPtr(FILE* f)
return offset;
}
static int64_t readSignVarPtr(FILE* f)
static uint32_t readSignVarPtr(FILE* f)
{
int64_t offset = readVarPtr(f);
bool sign = offset & 1;
@ -121,7 +122,7 @@ static int64_t readSignVarPtr(FILE* f)
if (sign) {
offset = -offset;
}
return offset;
return (uint32_t)(offset);
}
#ifndef MIN
@ -135,7 +136,7 @@ static uLong computePatchCRC(FILE* f, unsigned int size)
uLong crc = crc32(0L, Z_NULL, 0);
do {
readed = fread(buf, 1, MIN(size, sizeof(buf)), f);
readed = (long)(fread(buf, 1, MIN(size, sizeof(buf)), f));
crc = crc32(crc, buf, readed);
size -= readed;
} while (readed > 0);
@ -192,7 +193,7 @@ static bool patchApplyIPS(const char* patchname, uint8_t** r, int* s)
} else {
// fill the region with the given byte
while (len--) {
rom[offset++] = b;
rom[offset++] = (uint8_t)(b&0xff);
}
}
}
@ -234,7 +235,7 @@ static bool patchApplyUPS(const char* patchname, uint8_t** rom, int* size)
}
fseeko64(f, 0, SEEK_SET);
uint32_t crc = computePatchCRC(f, patchSize - 4);
uint32_t crc = computePatchCRC(f, (unsigned)(patchSize - 4));
if (crc != patchCRC) {
fclose(f);
@ -268,7 +269,7 @@ static bool patchApplyUPS(const char* patchname, uint8_t** rom, int* size)
if (dataSize > *size) {
*rom = (uint8_t*)realloc(*rom, dataSize);
memset(*rom + *size, 0, dataSize - *size);
*size = dataSize;
*size = (int)(dataSize);
}
int64_t relative = 0;
@ -324,7 +325,7 @@ static bool patchApplyBPS(const char* patchname, uint8_t** rom, int* size)
}
fseeko64(f, 0, SEEK_SET);
uint32_t crc = computePatchCRC(f, patchSize - 4);
uint32_t crc = computePatchCRC(f, (unsigned)(patchSize - 4));
if (crc != patchCRC) {
fclose(f);
@ -335,10 +336,10 @@ static bool patchApplyBPS(const char* patchname, uint8_t** rom, int* size)
crc = crc32(crc, *rom, *size);
fseeko64(f, 4, SEEK_SET);
int64_t dataSize;
int64_t srcSize = readVarPtr(f);
int64_t dstSize = readVarPtr(f);
int64_t mtdSize = readVarPtr(f);
int dataSize;
const int64_t srcSize = readVarPtr(f);
const int64_t dstSize = readVarPtr(f);
const int64_t mtdSize = readVarPtr(f);
fseeko64(f, mtdSize, SEEK_CUR);
if (crc == srcCRC) {
@ -346,13 +347,13 @@ static bool patchApplyBPS(const char* patchname, uint8_t** rom, int* size)
fclose(f);
return false;
}
dataSize = dstSize;
dataSize = (int)(dstSize);
} else if (crc == dstCRC) {
if (dstSize != *size) {
fclose(f);
return false;
}
dataSize = srcSize;
dataSize = (int)(srcSize);
} else {
fclose(f);
return false;
@ -377,7 +378,7 @@ static bool patchApplyBPS(const char* patchname, uint8_t** rom, int* size)
break;
case 1: // patchRead
while(length--) {
new_rom[outputOffset++] = fgetc(f);
new_rom[outputOffset++] = (uint8_t)(fgetc(f) & 0xff);
}
break;
case 2: // sourceCopy
@ -440,7 +441,7 @@ static int ppfFileIdLen(FILE* f, int version)
if (fgetc(f) != '.' || fgetc(f) != 'D' || fgetc(f) != 'I' || fgetc(f) != 'Z')
return 0;
return (version == 2) ? readInt4(f) : readInt2(f);
return (version == 2) ? int(readInt4(f)) : readInt2(f);
}
static bool patchApplyPPF1(FILE* f, uint8_t** rom, int* size)
@ -456,9 +457,10 @@ static bool patchApplyPPF1(FILE* f, uint8_t** rom, int* size)
uint8_t* mem = *rom;
while (count > 0) {
int offset = readInt4(f);
if (offset == -1)
int64_t offset_read = readInt4(f);
if (offset_read == -1)
break;
int offset = (int)(offset_read);
int len = fgetc(f);
if (len == EOF)
break;
@ -482,7 +484,11 @@ static bool patchApplyPPF2(FILE* f, uint8_t** rom, int* size)
fseek(f, 56, SEEK_SET);
int datalen = readInt4(f);
int64_t datalen_read = readInt4(f);
if (datalen_read == -1)
return false;
int datalen = (int)(datalen_read);
if (datalen != *size)
return false;
@ -500,9 +506,10 @@ static bool patchApplyPPF2(FILE* f, uint8_t** rom, int* size)
fseek(f, 56 + 4 + 1024, SEEK_SET);
while (count > 0) {
int offset = readInt4(f);
if (offset == -1)
int64_t offset_read = readInt4(f);
if (offset_read == -1)
break;
int offset = (int)(offset_read);
int len = fgetc(f);
if (len == EOF)
break;

10
src/common/SoundSDL.cpp
View File

@ -30,8 +30,8 @@ const double SoundSDL::buftime = 0.100;
SoundSDL::SoundSDL():
samples_buf(0),
sound_device(-1),
current_rate(throttle),
sound_device(0),
current_rate(static_cast<unsigned short>(throttle)),
initialized(false)
{}
@ -86,7 +86,7 @@ void SoundSDL::write(uint16_t * finalWave, int length) {
if (SDL_GetAudioDeviceStatus(sound_device) != SDL_AUDIO_PLAYING)
SDL_PauseAudioDevice(sound_device, 0);
unsigned int samples = length / 4;
std::size_t samples = length / 4;
std::size_t avail;
while ((avail = samples_buf.avail() / 2) < samples) {
@ -121,7 +121,7 @@ bool SoundSDL::init(long sampleRate) {
SDL_memset(&audio, 0, sizeof(audio));
// for "no throttle" use regular rate, audio is just dropped
audio.freq = current_rate ? sampleRate * (current_rate / 100.0) : sampleRate;
audio.freq = current_rate ? static_cast<int>(sampleRate * (current_rate / 100.0)) : sampleRate;
audio.format = AUDIO_S16SYS;
audio.channels = 2;
@ -138,7 +138,7 @@ bool SoundSDL::init(long sampleRate) {
return false;
}
samples_buf.reset(std::ceil(buftime * sampleRate * 2));
samples_buf.reset(static_cast<size_t>(std::ceil(buftime * sampleRate * 2)));
mutex = SDL_CreateMutex();
data_available = SDL_CreateSemaphore(0);

5
src/common/dictionary.c
View File

@ -87,7 +87,7 @@ static char *xstrdup(const char *s)
/*--------------------------------------------------------------------------*/
unsigned dictionary_hash(const char *key)
{
int len;
size_t len;
unsigned hash;
int i;
@ -122,7 +122,8 @@ dictionary *dictionary_new(int size)
if (size < DICTMINSZ)
size = DICTMINSZ;
if (!(d = (dictionary *)calloc(1, sizeof(dictionary)))) {
d = (dictionary *)calloc(1, sizeof(dictionary));
if (!d) {
return NULL;
}
d->size = size;