forked from Lainports/freebsd-ports
2ab3cf8b2c
The existing patch removed "<malloc.h>" but didn't provide "<stdlib.h>". Adjust to compound patch to fix that oversight. FWIW, the extra work to partially fix a patch is one reason I don't like one-patch-many-files. It's not the only reason.
87 lines
2.7 KiB
Text
87 lines
2.7 KiB
Text
Index: common/src/bytearrayreader.cpp
|
|
===================================================================
|
|
--- common/src/bytearrayreader.cpp (revision 1614)
|
|
+++ common/src/bytearrayreader.cpp (working copy)
|
|
@@ -24,7 +24,6 @@
|
|
#include "bytearrayreader.h"
|
|
#include "bytearray.h"
|
|
|
|
-const static unsigned long EXTRA_INCREMENT_LEN = 10;
|
|
|
|
/***************** ByteArray **************************/
|
|
|
|
Index: common/src/datafile.cpp
|
|
===================================================================
|
|
--- common/src/datafile.cpp (revision 1614)
|
|
+++ common/src/datafile.cpp (working copy)
|
|
@@ -249,8 +249,7 @@ bool CDataFile::Load(bool bLock)
|
|
while ( !bDone )
|
|
{
|
|
memset(buffer, 0, MAX_BUFFER_LEN);
|
|
- wchar_t* tmp = fgetws( buffer, MAX_BUFFER_LEN, m_stream);
|
|
- tmp=tmp; // avoid warning
|
|
+ (void)fgetws( buffer, MAX_BUFFER_LEN, m_stream);
|
|
|
|
szLine = buffer;
|
|
Trim(szLine);
|
|
@@ -1011,8 +1010,7 @@ int WriteLn(FILE * stream, wchar_t* fmt,
|
|
if ( buf[nLength] != '\n' && buf[nLength] != '\r' )
|
|
buf[nLength++] = '\n';
|
|
|
|
- size_t tmp = fwrite(buf, sizeof( wchar_t ), nLength, stream);
|
|
- tmp = tmp; // avoid warning
|
|
+ (void)fwrite(buf, sizeof( wchar_t ), nLength, stream);
|
|
|
|
return nLength;
|
|
}
|
|
Index: common/src/logbase.cpp
|
|
===================================================================
|
|
--- common/src/logbase.cpp.orig 2014-09-30 18:10:35 UTC
|
|
+++ common/src/logbase.cpp
|
|
@@ -29,12 +29,8 @@
|
|
#include "mw_util.h"
|
|
|
|
#ifndef WIN32
|
|
-#include <malloc.h>
|
|
-#ifdef LINUX
|
|
+#include <stdlib.h>
|
|
#include "wintypes.h"
|
|
-#else
|
|
-#include "PCSC/wintypes.h"
|
|
-#endif
|
|
#include "sys/stat.h"
|
|
#include "util.h"
|
|
|
|
@@ -575,6 +571,7 @@ bool CLog::open(bool bWchar)
|
|
else
|
|
err = fopen_s(&m_f,utilStringNarrow(filename).c_str(),"a");
|
|
#else
|
|
+ (void)bWchar;
|
|
m_f = fopen(utilStringNarrow(filename).c_str(),"a, ccs=UTF-8");
|
|
if (m_f == NULL) err=errno;
|
|
#endif
|
|
Index: common/src/mw_util.h
|
|
===================================================================
|
|
--- common/src/mw_util.h (revision 1614)
|
|
+++ common/src/mw_util.h (working copy)
|
|
@@ -38,7 +38,6 @@
|
|
#endif
|
|
|
|
#if !defined __APPLE__ && !defined USE_WINERROR
|
|
-#include "error.h"
|
|
#endif
|
|
|
|
#ifndef HAVE_ERRNO_T
|
|
Index: common/src/util.cpp
|
|
===================================================================
|
|
--- common/src/util.cpp (revision 1614)
|
|
+++ common/src/util.cpp (working copy)
|
|
@@ -348,7 +348,7 @@ void GetProcessName(wchar_t *wBuffer,uns
|
|
/* Get our PID and build the name of the link in /proc */
|
|
pid = getpid();
|
|
|
|
- if (snprintf(linkname, sizeof(linkname), "/proc/%i/exe", pid) < 0)
|
|
+ if (snprintf(linkname, sizeof(linkname), "/proc/%i/file", pid) < 0)
|
|
{
|
|
/* This should only happen on large word systems. I'm not sure
|
|
what the proper response is here.
|