summaryrefslogtreecommitdiff
path: root/Source/Core/Common
diff options
context:
space:
mode:
authorhrydgard <hrydgard@gmail.com>2009-03-05 22:35:06 +0000
committerhrydgard <hrydgard@gmail.com>2009-03-05 22:35:06 +0000
commit02a4b49df196471bd56cd73b46891074cbdfdc34 (patch)
tree737f0be4114aa2c6f2ecf7ade9fe28b10b950586 /Source/Core/Common
parent3f840806b3c3504d826d29ce7c7c1d336c02adc7 (diff)
just some compiler warning cleanup.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2562 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/Common')
-rw-r--r--Source/Core/Common/Src/ChunkFile.h8
-rw-r--r--Source/Core/Common/Src/Log.h8
2 files changed, 8 insertions, 8 deletions
diff --git a/Source/Core/Common/Src/ChunkFile.h b/Source/Core/Common/Src/ChunkFile.h
index bcdfe2746f..b9145f04c1 100644
--- a/Source/Core/Common/Src/ChunkFile.h
+++ b/Source/Core/Common/Src/ChunkFile.h
@@ -157,8 +157,8 @@ public:
return false;
}
- FILE* pFile;
- if (! (pFile = fopen(_rFilename.c_str(), "rb"))) {
+ FILE* pFile = fopen(_rFilename.c_str(), "rb");
+ if (!pFile) {
ERROR_LOG(COMMON,"ChunkReader: Can't open file for reading");
return false;
}
@@ -219,8 +219,8 @@ public:
FILE* pFile;
INFO_LOG(COMMON, "ChunkReader: Writing %s" , _rFilename.c_str());
-
- if (! (pFile = fopen(_rFilename.c_str(), "wb"))) {
+ pFile = fopen(_rFilename.c_str(), "wb");
+ if (!pFile) {
ERROR_LOG(COMMON,"ChunkReader: Error opening file for write");
return false;
}
diff --git a/Source/Core/Common/Src/Log.h b/Source/Core/Common/Src/Log.h
index 83a022d7e7..b4790a5ba3 100644
--- a/Source/Core/Common/Src/Log.h
+++ b/Source/Core/Common/Src/Log.h
@@ -83,10 +83,10 @@ enum LOG_LEVELS {
#endif // loglevel
#endif // logging
-#define ERROR_LOG(...)
-#define WARN_LOG(...)
-#define INFO_LOG(...)
-#define DEBUG_LOG(...)
+#define ERROR_LOG(...) {}
+#define WARN_LOG(...) {}
+#define INFO_LOG(...) {}
+#define DEBUG_LOG(...) {}
extern void __Log(int logNumber, const char* text, ...);