izzy/dolphin
0
0
Fork 0
mirror of https://github.com/izzy2lost/dolphin.git synced 2026-06-19 01:16:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #228 from delroth/trailing-whitespaces

Browse Source 
Remove all trailing whitespaces from our codebase.
This commit is contained in:
Pierre Bourdon
2014-03-29 11:13:59 +01:00
parent 92fc7c64d6 664c8d30a0
commit 47d96e449a
52 changed files with 95 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Core/AudioCommon/AudioCommon.cpp
+1 -1
View File
@@ -24,7 +24,7 @@
// This shouldn't be a global, at least not here.
SoundStream *soundStream = nullptr;
namespace AudioCommon
namespace AudioCommon
{
SoundStream *InitSoundStream(CMixer *mixer, void *hWnd)
{
Source/Core/AudioCommon/XAudio2_7Stream.h
+1 -1
View File
@@ -59,7 +59,7 @@ private:
public:
XAudio2_7(CMixer *mixer);
virtual ~XAudio2_7();
virtual bool Start();
virtual void Stop();
Source/Core/Common/Atomic.h
+1 -1
View File
@@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#pragma once
#pragma once
#ifdef _WIN32
Source/Core/Common/CommonFuncs.h
+3 -3
View File
@@ -31,8 +31,8 @@ struct ArraySizeImpl : public std::extent<T>
#define b32(x) (b16(x) | (b16(x) >>16) )
#define ROUND_UP_POW2(x) (b32(x - 1) + 1)
#ifndef __GNUC_PREREQ
#define __GNUC_PREREQ(a, b) 0
#ifndef __GNUC_PREREQ
#define __GNUC_PREREQ(a, b) 0
#endif
#if (defined __GNUC__ && !__GNUC_PREREQ(4,9)) && \
@@ -188,7 +188,7 @@ inline u32 swap24(const u8* _data) {return (_data[0] << 16) | (_data[1] << 8) |
inline u16 swap16(u16 _data) {return _byteswap_ushort(_data);}
inline u32 swap32(u32 _data) {return _byteswap_ulong (_data);}
inline u64 swap64(u64 _data) {return _byteswap_uint64(_data);}
#elif _M_ARM_32
#elif _M_ARM_32
inline u16 swap16 (u16 _data) { u32 data = _data; __asm__ ("rev16 %0, %1\n" : "=l" (data) : "l" (data)); return (u16)data;}
inline u32 swap32 (u32 _data) {__asm__ ("rev %0, %1\n" : "=l" (_data) : "l" (_data)); return _data;}
inline u64 swap64(u64 _data) {return ((u64)swap32(_data) << 32) | swap32(_data >> 32);}
Source/Core/Common/IniFile.h
+1 -1
View File
@@ -145,6 +145,6 @@ private:
Section* GetSection(const std::string& section);
std::string* GetLine(const std::string& section, const std::string& key);
void CreateSection(const std::string& section);
static const std::string& NULL_STRING;
};
Source/Core/Common/LogManager.cpp
+1 -1
View File
@@ -128,7 +128,7 @@ void LogManager::Log(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type,
std::string msg = StringFromFormat("%s %s:%u %c[%s]: %s\n",
Common::Timer::GetTimeFormatted().c_str(),
file, line,
file, line,
LogTypes::LOG_LEVEL_TO_CHAR[(int)level],
log->GetShortName(), temp);
#ifdef ANDROID
Source/Core/Common/MemoryUtil.cpp
+1 -1
View File
@@ -52,7 +52,7 @@ void* AllocateExecutableMemory(size_t size, bool low)
// printf("Mapped executable memory at %p (size %ld)\n", ptr,
// (unsigned long)size);
#if defined(__FreeBSD__)
if (ptr == MAP_FAILED)
{
Source/Core/Common/NandPaths.cpp
+2 -2
View File
@@ -18,7 +18,7 @@ namespace Common
std::string GetTicketFileName(u64 _titleID)
{
return StringFromFormat("%sticket/%08x/%08x.tik",
File::GetUserPath(D_WIIUSER_IDX).c_str(),
File::GetUserPath(D_WIIUSER_IDX).c_str(),
(u32)(_titleID >> 32), (u32)_titleID);
}
@@ -36,7 +36,7 @@ std::string GetTMDFileName(u64 _titleID)
std::string GetTitleContentPath(u64 _titleID)
{
return StringFromFormat("%stitle/%08x/%08x/content/",
File::GetUserPath(D_WIIUSER_IDX).c_str(),
File::GetUserPath(D_WIIUSER_IDX).c_str(),
(u32)(_titleID >> 32), (u32)_titleID);
}
Source/Core/Common/SettingsHandler.h
+1 -1
View File
@@ -21,7 +21,7 @@ public:
// Key used to encrypt/decrypt setting.txt contents
INITIAL_SEED = 0x73B5DBFA
};
void AddSetting(const std::string& key, const std::string& value);
const u8 *GetData() const;
Source/Core/Common/Thread.h
+2 -2
View File
@@ -59,8 +59,8 @@ public:
void Reset()
{
std::unique_lock<std::mutex> lk(m_mutex);
// no other action required, since wait loops on
// the predicate and any lingering signal will get
// no other action required, since wait loops on
// the predicate and any lingering signal will get
// cleared on the first iteration
is_set = false;
}
Source/Core/Common/Timer.cpp
+1 -1
View File
@@ -171,7 +171,7 @@ std::string Timer::GetTimeFormatted()
{
time_t sysTime;
time(&sysTime);
struct tm * gmTime = localtime(&sysTime);
char tmp[13];
Source/Core/Common/x64Emitter.cpp
+1 -1
View File
@@ -210,7 +210,7 @@ void OpArg::WriteRest(XEmitter *emit, int extraBytes, X64Reg _operandReg,
#if _M_X86_64
u64 ripAddr = (u64)emit->GetCodePtr() + 4 + extraBytes;
s64 distance = (s64)offset - (s64)ripAddr;
_assert_msg_(DYNA_REC,
_assert_msg_(DYNA_REC,
(distance < 0x80000000LL &&
distance >= -0x80000000LL) ||
!warn_64bit_offset,
Source/Core/Common/x64Emitter.h
+1 -1
View File
@@ -200,7 +200,7 @@ inline OpArg ImmPtr(const void* imm) {return Imm64((u64)imm);}
inline OpArg ImmPtr(const void* imm) {return Imm32((u32)imm);}
#endif
inline u32 PtrOffset(void* ptr, void* base) {
#ifdef _ARCH_64
#ifdef _ARCH_64
s64 distance = (s64)ptr-(s64)base;
if (distance >= 0x80000000LL ||
distance < -0x80000000LL) {
Source/Core/Core/Boot/Boot.h
+2 -2
View File
@@ -12,14 +12,14 @@
#include "DiscIO/Volume.h"
using DiscIO::IVolume;
typedef struct CountrySetting
typedef struct CountrySetting
{
const std::string area;
const std::string video;
const std::string game;
const std::string code;
} CountrySetting;
class CBoot
{
public:
Source/Core/Core/Boot/Boot_BS2Emu.cpp
+5 -5
View File
@@ -171,9 +171,9 @@ bool CBoot::SetupWiiMemory(IVolume::ECountry country)
{IVolume::COUNTRY_TAIWAN, {"JPN", "NTSC", "JP", "LJ"}}
};
auto entryPos = country_settings.find(country);
const CountrySetting& country_setting =
(entryPos != country_settings.end()) ?
entryPos->second :
const CountrySetting& country_setting =
(entryPos != country_settings.end()) ?
entryPos->second :
SETTING_EUROPE; //Default to EUROPE
SettingsHandler gen;
@@ -210,7 +210,7 @@ bool CBoot::SetupWiiMemory(IVolume::ECountry country)
gen.AddSetting("SERNO", serno);
gen.AddSetting("VIDEO", country_setting.video);
gen.AddSetting("GAME", country_setting.game);
File::CreateFullPath(settings_Filename);
{
File::IOFile settingsFileHandle(settings_Filename, "wb");
@@ -225,7 +225,7 @@ bool CBoot::SetupWiiMemory(IVolume::ECountry country)
}
INFO_LOG(BOOT, "Setup Wii Memory...");
/*
Set hardcoded global variables to Wii memory. These are partly collected from
Wiibrew. These values are needed for the games to function correctly. A few
Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp
+2 -2
View File
@@ -357,9 +357,9 @@ void Spy(Wiimote* wm_, const void* data_, size_t size_)
//if(((((u8*)&wm->m_reg_ext)[0xf0] == 0xaa) || ((u8*)&wm->m_reg_motion_plus)[0xf0] == 0xaa) && rdr->address>>8 < 0xf0) {
//if(!wm->GetMotionPlusActive() && ((u8*)&wm->m_reg_ext)[0xf0] == 0xaa && rdr->address>>8 < 0xf0) {
//if(!wm->GetMotionPlusActive() && ((u8*)&wm->m_reg_ext)[0xf0] == 0xaa) {
// SWARN_LOG(CONSOLE, "key %s", ArrayToString(((u8*)&wm->m_ext_key), sizeof(wm->m_ext_key), 0, 30).c_str());
// SWARN_LOG(CONSOLE, "decrypt %s", ArrayToString(rdr->data, rdr->size+1, 0, 30).c_str());
// wiimote_decrypt(&wm->m_ext_key, rdr->data, dataReply[2]&0xffff, rdr->size+1);
Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp
+1 -1
View File
@@ -299,7 +299,7 @@ void Wiimote::Update()
// Send the report
if (!rpt.empty() && m_channel > 0)
{
Core::Callback_WiimoteInterruptChannel(index, m_channel,
Core::Callback_WiimoteInterruptChannel(index, m_channel,
rpt.data(), (u32)rpt.size());
}
}
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.cpp
+1 -1
View File
@@ -400,7 +400,7 @@ void CWII_IPC_HLE_Device_hid::FillOutDevices(u32 BufferOut, u32 BufferOutSize)
for (ic = 0; ic < config->bNumInterfaces; ic++)
{
const struct libusb_interface *interfaceContainer = &config->interface[ic];
for (i = 0; i < interfaceContainer->num_altsetting; i++)
{
const struct libusb_interface_descriptor *interface = &interfaceContainer->altsetting[i];
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp
+2 -2
View File
@@ -408,7 +408,7 @@ bool CWII_IPC_HLE_Device_net_ncd_manage::IOCtlV(u32 _CommandAddress)
case IOCTLV_NCD_GETWIRELESSMACADDRESS:
INFO_LOG(WII_IPC_NET, "NET_NCD_MANAGE: IOCTLV_NCD_GETWIRELESSMACADDRESS");
u8 address[MAC_ADDRESS_SIZE];
GetMacAddress(address);
Memory::WriteBigEData(address,
@@ -505,7 +505,7 @@ bool CWII_IPC_HLE_Device_net_wd_command::IOCtlV(u32 CommandAddress)
// Probably used to disallow certain channels?
memcpy(info->country, "US", 2);
info->ntr_allowed_channels = Common::swap16(0xfffe);
u8 address[MAC_ADDRESS_SIZE];
GetMacAddress(address);
memcpy(info->mac, address, sizeof(info->mac));
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp
+1 -1
View File
@@ -208,7 +208,7 @@ _SSL_NEW_ERROR:
ssl_free(&ssl->ctx);
entropy_free(&ssl->entropy);
x509_crt_free(&ssl->cacert);
x509_crt_free(&ssl->clicert);

Some files were not shown because too many files have changed in this diff Show More