From ce53a719906399900def02cdcd68bd6a7a8b5df8 Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Tue, 22 Jul 2014 22:38:05 -0700 Subject: [PATCH] There is no benefit to the hsFopen macro --- Sources/Plasma/CoreLib/HeadSpin.h | 2 -- Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.cpp | 3 +-- Sources/Tools/MaxExport/plExportLogErrorMsg.cpp | 4 ++-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Sources/Plasma/CoreLib/HeadSpin.h b/Sources/Plasma/CoreLib/HeadSpin.h index 513d153f..f4a6e7fe 100644 --- a/Sources/Plasma/CoreLib/HeadSpin.h +++ b/Sources/Plasma/CoreLib/HeadSpin.h @@ -366,8 +366,6 @@ inline float hsRadiansToDegrees(float rad) { return float(rad * (180 / M_PI)); } # define ALIGN(n) __atribute__(aligned(n)) #endif -#define hsFopen(name, mode) fopen(name, mode) - /************************ Debug/Error Macros **************************/ typedef void (*hsDebugMessageProc)(const char message[]); diff --git a/Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.cpp b/Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.cpp index 6fa46f62..9a4f9b88 100644 --- a/Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plInputCore/plInputInterfaceMgr.cpp @@ -765,8 +765,7 @@ void plInputInterfaceMgr::WriteKeyMap( void ) #ifdef PLASMA_EXTERNAL_RELEASE return; #endif - FILE* gKeyFile = 0; - gKeyFile = hsFopen( "init\\keyboard.fni", "wt" ); + FILE* gKeyFile = fopen("init\\keyboard.fni", "wt"); if (gKeyFile) { diff --git a/Sources/Tools/MaxExport/plExportLogErrorMsg.cpp b/Sources/Tools/MaxExport/plExportLogErrorMsg.cpp index bc0e0761..571c408b 100644 --- a/Sources/Tools/MaxExport/plExportLogErrorMsg.cpp +++ b/Sources/Tools/MaxExport/plExportLogErrorMsg.cpp @@ -74,7 +74,7 @@ plExportLogErrorMsg::~plExportLogErrorMsg() #ifdef ERRORLOG_ALWAYS_WRITE_SOMETHING else { - fErrfile = hsFopen(fErrfile_name, "wt"); + fErrfile = fopen(fErrfile_name, "wt"); setbuf(fErrfile, nil); fprintf(fErrfile, "No errors found! Good job."); fclose(fErrfile); @@ -170,7 +170,7 @@ void plExportLogErrorMsg::IWriteErrorFile(const char* label, const char* msg) if ( !fErrfile ) { // must be the first write... open the error file - fErrfile = hsFopen(fErrfile_name, "wt"); + fErrfile = fopen(fErrfile_name, "wt"); setbuf(fErrfile, nil); fNumberErrors = 0; }