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

Repaired some more of the Linux-side of things. It's the least I can do for having constantly broken it. >_< 

git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@573 a6443dda-0b58-4228-96e9-037be469359c
This commit is contained in:
Jake.Stine 2009-01-10 04:57:30 +00:00 committed by Gregory Hainaut
parent 1b45f46fb5
commit 0c2f86a870
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pcsx2/Linux/ConfigDlg.cpp
View File

@ -478,7 +478,7 @@ void FindPlugins() {
Handle = dlopen(plugin, RTLD_NOW);
if (Handle == NULL)
{
Console::Error("Can't open %s: %s\n"_F, ent->d_name, dlerror());
Console::Error("Can't open %s: %s", params ent->d_name, dlerror());
continue;
}
@ -488,17 +488,17 @@ void FindPlugins() {
if (PS2EgetLibType == NULL)
{
Console::Error("PS2EgetLibType==NULL for %s"_F, ent->d_name);
Console::Error("PS2EgetLibType==NULL for %s", params ent->d_name);
continue;
}
if (PS2EgetLibName == NULL)
{
Console::Error("PS2EgetLibName==NULL for %s"_F, ent->d_name);
Console::Error("PS2EgetLibName==NULL for %s", params ent->d_name);
continue;
}
if (PS2EgetLibVersion2 == NULL)
{
Console::Error("PS2EgetLibVersion2==NULL for %s"_F, ent->d_name);
Console::Error("PS2EgetLibVersion2==NULL for %s", params ent->d_name);
continue;
}
@ -526,7 +526,7 @@ void FindPlugins() {
if (query() & 0x2) ComboAddPlugin(name, &PAD2ConfS, version, ent);
}
else
Console::Notice("Plugin %s: Version %x != %x"_F, plugin, (version >> 16)&0xff, PS2E_PAD_VERSION);
Console::Notice("Plugin %s: Version %x != %x", params plugin, (version >> 16)&0xff, PS2E_PAD_VERSION);
}
if (type & PS2E_LT_SPU2)
{
@ -535,7 +535,7 @@ void FindPlugins() {
if (((version >> 16)&0xff) == PS2E_SPU2_VERSION)
ComboAddPlugin(name, &SPU2ConfS, version, ent);
else
Console::Notice("Plugin %s: Version %x != %x"_F, plugin, (version >> 16)&0xff, PS2E_SPU2_VERSION);
Console::Notice("Plugin %s: Version %x != %x", params plugin, (version >> 16)&0xff, PS2E_SPU2_VERSION);
}
if (type & PS2E_LT_CDVD)
{
@ -544,7 +544,7 @@ void FindPlugins() {
if (((version >> 16)&0xff) == PS2E_CDVD_VERSION)
ComboAddPlugin(name, &CDVDConfS, version, ent);
else
Console::Notice("Plugin %s: Version %x != %x"_F, plugin, (version >> 16)&0xff, PS2E_CDVD_VERSION);
Console::Notice("Plugin %s: Version %x != %x", params plugin, (version >> 16)&0xff, PS2E_CDVD_VERSION);
}
if (type & PS2E_LT_DEV9)
{
@ -553,7 +553,7 @@ void FindPlugins() {
if (((version >> 16)&0xff) == PS2E_DEV9_VERSION)
ComboAddPlugin(name, &DEV9ConfS, version, ent);
else
Console::Notice("DEV9Plugin %s: Version %x != %x"_F, plugin, (version >> 16)&0xff, PS2E_DEV9_VERSION);
Console::Notice("DEV9Plugin %s: Version %x != %x", params plugin, (version >> 16)&0xff, PS2E_DEV9_VERSION);
}
if (type & PS2E_LT_USB)
{
@ -562,7 +562,7 @@ void FindPlugins() {
if (((version >> 16)&0xff) == PS2E_USB_VERSION)
ComboAddPlugin(name, &USBConfS, version, ent);
else
Console::Notice("USBPlugin %s: Version %x != %x"_F, plugin, (version >> 16)&0xff, PS2E_USB_VERSION);
Console::Notice("USBPlugin %s: Version %x != %x", params plugin, (version >> 16)&0xff, PS2E_USB_VERSION);
}
if (type & PS2E_LT_FW)
{
@ -571,7 +571,7 @@ void FindPlugins() {
if (((version >> 16)&0xff) == PS2E_FW_VERSION)
ComboAddPlugin(name, &FWConfS, version, ent);
else
Console::Notice("FWPlugin %s: Version %x != %x"_F, plugin, (version >> 16)&0xff, PS2E_FW_VERSION);
Console::Notice("FWPlugin %s: Version %x != %x", params plugin, (version >> 16)&0xff, PS2E_FW_VERSION);
}
}
closedir(dir);

2
pcsx2/Linux/LnxThreads.cpp
View File

@ -72,7 +72,7 @@ namespace Threading
}
catch( std::exception& ex )
{
Console::Error( "Thread terminated abnormally with error:\n\t%s"_F, ex.what() );
Console::Error( "Thread terminated abnormally with error:\n\t%s", params ex.what() );
owner.m_returncode = -1;
}