piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid always-true and signed/unsigned comparisons.

Browse Source 
Make empty while loops a little more obvious with a {} suffix.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6019 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2010-07-31 19:06:44 +00:00
parent 0e83d52382
commit 3d25197a1c
10 changed files with 3795 additions and 3794 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Externals/SOIL/stb_image_aug.c vendored
View File

@ -419,7 +419,7 @@ static void skip(stbi *s, int n)
s->img_buffer += n; s->img_buffer += n;
} }
static int get16(stbi *s) static uint16 get16(stbi *s)
{ {
int z = get8(s); int z = get8(s);
return (z << 8) + get8(s); return (z << 8) + get8(s);
@ -431,7 +431,7 @@ static uint32 get32(stbi *s)
return (z << 16) + get16(s); return (z << 16) + get16(s);
} }
static int get16le(stbi *s) static uint16 get16le(stbi *s)
{ {
int z = get8(s); int z = get8(s);
return z + (get8(s) << 8); return z + (get8(s) << 8);

11
Externals/SOIL/stbi_DDS_aug_c.h vendored
View File

@ -271,12 +271,13 @@ static stbi_uc *dds_load(stbi *s, int *x, int *y, int *comp, int req_comp)
stbi_uc *dds_data = NULL; stbi_uc *dds_data = NULL;
stbi_uc block[16*4]; stbi_uc block[16*4];
stbi_uc compressed[8]; stbi_uc compressed[8];
int flags, DXT_family; unsigned int flags;
int DXT_family;
int has_alpha, has_mipmap; int has_alpha, has_mipmap;
int is_compressed, cubemap_faces; int is_compressed, cubemap_faces;
int block_pitch, num_blocks; int block_pitch, cf;
DDS_header header; DDS_header header;
int i, sz, cf; unsigned int i, num_blocks, sz;
// load the header // load the header
if( sizeof( DDS_header ) != 128 ) if( sizeof( DDS_header ) != 128 )
{ {
@ -335,8 +336,8 @@ static stbi_uc *dds_load(stbi *s, int *x, int *y, int *comp, int req_comp)
{ {
// where are we? // where are we?
int bx, by, bw=4, bh=4; int bx, by, bw=4, bh=4;
int ref_x = 4 * (i % block_pitch); unsigned int ref_x = 4 * (i % block_pitch);
int ref_y = 4 * (i / block_pitch); unsigned int ref_y = 4 * (i / block_pitch);
// get the next block's worth of compressed data, and decompress it // get the next block's worth of compressed data, and decompress it
if( DXT_family == 1 ) if( DXT_family == 1 )
{ {

2
Externals/WiiUse/Src/io_osx.m vendored
View File

@ -56,7 +56,7 @@ volatile int reader, writer, outstanding, watermark;
@interface SearchBT: NSObject { @interface SearchBT: NSObject {
@public @public
int maxDevices; unsigned int maxDevices;
} }
@end @end

4
Source/Core/Common/Src/Log.h
View File

@ -140,8 +140,8 @@ void GenericLogC(int level, int type,
#define _dbg_update_() ; #define _dbg_update_() ;
#ifndef _dbg_assert_ #ifndef _dbg_assert_
#define _dbg_assert_(_t_, _a_) ; #define _dbg_assert_(_t_, _a_) {}
#define _dbg_assert_msg_(_t_, _a_, _desc_, ...) ; #define _dbg_assert_msg_(_t_, _a_, _desc_, ...) {}
#endif // dbg_assert #endif // dbg_assert
#endif // MAX_LOGLEVEL DEBUG #endif // MAX_LOGLEVEL DEBUG

2
Source/Core/Core/Src/CoreTiming.cpp
View File

@ -522,7 +522,7 @@ std::string GetScheduledEventsSummary()
while (ptr) while (ptr)
{ {
unsigned int t = ptr->type; unsigned int t = ptr->type;
if (t < 0 || t >= event_types.size()) if (t >= event_types.size())
PanicAlert("Invalid event type %i", t); PanicAlert("Invalid event type %i", t);
const char *name = event_types[ptr->type].name; const char *name = event_types[ptr->type].name;
if (!name) if (!name)

2
Source/Core/Core/Src/HW/SI_DeviceAMBaseboard.cpp
View File

@ -299,7 +299,7 @@ int CSIDevice_AMBaseboard::RunBuffer(u8* _pBuffer, int _iLength)
msg.addData((void *)"\x00\x00\x00\x00", 4); msg.addData((void *)"\x00\x00\x00\x00", 4);
break; break;
case 0x15: case 0x15:
while (*jvs_io++); while (*jvs_io++) {};
msg.addData(1); msg.addData(1);
break; break;
case 0x20: case 0x20:

4
Source/Core/Core/Src/PowerPC/Jit64/JitRegCache.cpp
View File

@ -330,7 +330,7 @@ void FPURegCache::LoadToX64(int i, bool doLoad, bool makeDirty)
{ {
// Reg is at home in the memory register file. Let's pull it out. // Reg is at home in the memory register file. Let's pull it out.
X64Reg xr = GetFreeXReg(); X64Reg xr = GetFreeXReg();
_assert_msg_(DYNA_REC, xr >= 0 && xr < NUMXREGS, "WTF - load - invalid reg"); _assert_msg_(DYNA_REC, xr < NUMXREGS, "WTF - load - invalid reg");
xregs[xr].ppcReg = i; xregs[xr].ppcReg = i;
xregs[xr].free = false; xregs[xr].free = false;
xregs[xr].dirty = makeDirty; xregs[xr].dirty = makeDirty;
@ -357,7 +357,7 @@ void FPURegCache::StoreFromX64(int i)
if (regs[i].away) if (regs[i].away)
{ {
X64Reg xr = regs[i].location.GetSimpleReg(); X64Reg xr = regs[i].location.GetSimpleReg();
_assert_msg_(DYNA_REC, xr >= 0 && xr < NUMXREGS, "WTF - store - invalid reg"); _assert_msg_(DYNA_REC, xr < NUMXREGS, "WTF - store - invalid reg");
xregs[xr].free = true; xregs[xr].free = true;
xregs[xr].dirty = false; xregs[xr].dirty = false;
xregs[xr].ppcReg = -1; xregs[xr].ppcReg = -1;

6
Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_Zelda.cpp
View File

@ -169,7 +169,7 @@ void CUCode_Zelda::HandleMail_LightVersion(u32 _uMail)
m_step = 0; m_step = 0;
} }
if (m_step < 0 || m_step >= sizeof(m_Buffer) / 4) if (m_step >= sizeof(m_Buffer) / 4)
PanicAlert("m_step out of range"); PanicAlert("m_step out of range");
((u32*)m_Buffer)[m_step] = _uMail; ((u32*)m_Buffer)[m_step] = _uMail;
@ -226,7 +226,7 @@ void CUCode_Zelda::HandleMail_SMSVersion(u32 _uMail)
if (m_bListInProgress) if (m_bListInProgress)
{ {
if (m_step < 0 || m_step >= sizeof(m_Buffer) / 4) if (m_step >= sizeof(m_Buffer) / 4)
PanicAlert("m_step out of range"); PanicAlert("m_step out of range");
((u32*)m_Buffer)[m_step] = _uMail; ((u32*)m_Buffer)[m_step] = _uMail;
@ -349,7 +349,7 @@ void CUCode_Zelda::HandleMail_NormalVersion(u32 _uMail)
if (m_bListInProgress) if (m_bListInProgress)
{ {
if (m_step < 0 || m_step >= sizeof(m_Buffer) / 4) if (m_step >= sizeof(m_Buffer) / 4)
PanicAlert("m_step out of range"); PanicAlert("m_step out of range");
((u32*)m_Buffer)[m_step] = _uMail; ((u32*)m_Buffer)[m_step] = _uMail;

4
Source/Plugins/Plugin_WiimoteNew/Src/WiimoteReal/WiimoteReal.cpp
View File

@ -174,7 +174,7 @@ void Wiimote::InterruptChannel(const u16 channel, const void* const data, const
if (0 == m_channel) // first interrupt/control channel sent if (0 == m_channel) // first interrupt/control channel sent
{ {
// clear all msgs, silly maybe // clear all msgs, silly maybe
while (wiiuse_io_read(m_wiimote)); while (wiiuse_io_read(m_wiimote)) {};
// request status // request status
wm_request_status rpt = wm_request_status(); wm_request_status rpt = wm_request_status();
@ -251,7 +251,7 @@ void Wiimote::Disconnect()
ClearReports(); ClearReports();
// clear out wiiuse queue, or maybe not, silly? idk // clear out wiiuse queue, or maybe not, silly? idk
while (wiiuse_io_read(m_wiimote)); while (wiiuse_io_read(m_wiimote)) {};
} }
Wiimote* g_wiimotes[4]; Wiimote* g_wiimotes[4];