Browse Source

Fix some more conformance difference related errors/warnings

(cherry picked [partial] from commit 37a87f3b54)
rarified/huru-merge-work/code-cleanup
Zrax 14 years ago committed by rarified
parent
commit
4320674bd8
  1. 2
      Sources/Plasma/PubUtilLib/plFile/plFileUtils.cpp
  2. 8
      Sources/Plasma/PubUtilLib/plStatusLog/plStatusLog.cpp

2
Sources/Plasma/PubUtilLib/plFile/plFileUtils.cpp

@ -64,6 +64,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include <time.h> #include <time.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <errno.h>
#if HS_BUILD_FOR_WIN32 #if HS_BUILD_FOR_WIN32
@ -73,7 +74,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#if HS_BUILD_FOR_UNIX #if HS_BUILD_FOR_UNIX
#include <unistd.h> #include <unistd.h>
#include <errno.h>
#include <utime.h> #include <utime.h>
#endif #endif

8
Sources/Plasma/PubUtilLib/plStatusLog/plStatusLog.cpp

@ -472,15 +472,15 @@ bool plStatusLog::IReOpen( void )
ext = L".elf"; ext = L".elf";
#endif #endif
wchar fileToOpen[MAX_PATH]; wchar fileToOpen[MAX_PATH];
swprintf(fileToOpen, L"%s.0%s", fileNoExt, ext); swprintf(fileToOpen, MAX_PATH, L"%s.0%s", fileNoExt, ext);
if (!(fFlags & kDontRotateLogs)) if (!(fFlags & kDontRotateLogs))
{ {
wchar work[MAX_PATH], work2[MAX_PATH]; wchar work[MAX_PATH], work2[MAX_PATH];
swprintf(work, L"%s.3%s",fileNoExt,ext); swprintf(work, MAX_PATH, L"%s.3%s",fileNoExt,ext);
_wremove(work); _wremove(work);
swprintf(work2, L"%s.2%s",fileNoExt,ext); swprintf(work2, MAX_PATH, L"%s.2%s",fileNoExt,ext);
_wrename(work2, work); _wrename(work2, work);
swprintf(work, L"%s.1%s",fileNoExt,ext); swprintf(work, MAX_PATH, L"%s.1%s",fileNoExt,ext);
_wrename(work, work2); _wrename(work, work2);
_wrename(fileToOpen, work); _wrename(fileToOpen, work);
} }

Loading…
Cancel
Save