mirror of
https://github.com/SWG-Source/src.git
synced 2026-09-21 08:12:50 -04:00
hopefully implement va_end properly - may require some fixes or reverts, partial or full
This commit is contained in:
@@ -1554,7 +1554,7 @@ SessionApiClient* ConnectionServer::getSessionApiClient()
|
||||
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
void ConnectionServer::setDone(char const *reasonfmt, ...)
|
||||
void ConnectionServer::setDone(char const reasonfmt, ...)
|
||||
{
|
||||
if (!done)
|
||||
{
|
||||
@@ -1579,6 +1579,7 @@ void ConnectionServer::setDone(char const *reasonfmt, ...)
|
||||
reason));
|
||||
|
||||
done = true;
|
||||
va_end(ap);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@ class ConnectionServer : public MessageDispatch::Receiver
|
||||
public:
|
||||
static void install();
|
||||
static void remove();
|
||||
void setDone(char const *reasonfmt, ...);
|
||||
void setDone(char const reasonfmt, ...);
|
||||
|
||||
~ConnectionServer ();
|
||||
|
||||
|
||||
@@ -127,7 +127,7 @@ void LogServer::receiveMessage(MessageDispatch::Emitter const &source, MessageDi
|
||||
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
void LogServer::setDone(char const *reasonfmt, ...)
|
||||
void LogServer::setDone(char const reasonfmt, ...)
|
||||
{
|
||||
if (!m_done)
|
||||
{
|
||||
@@ -151,6 +151,7 @@ void LogServer::setDone(char const *reasonfmt, ...)
|
||||
static_cast<int>(Os::getProcessId()),
|
||||
reason));
|
||||
|
||||
va_end(ap);
|
||||
m_done = true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -30,7 +30,7 @@ public:
|
||||
static void remove();
|
||||
static void run();
|
||||
void mainLoop();
|
||||
void setDone(char const *reason, ...);
|
||||
void setDone(char const reason, ...);
|
||||
|
||||
virtual void receiveMessage(MessageDispatch::Emitter const &source, MessageDispatch::MessageBase const &message);
|
||||
|
||||
|
||||
@@ -1449,7 +1449,7 @@ void PlanetServer::sendQueuedMessagesForObject(const PlanetProxyObject &theObjec
|
||||
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
void PlanetServer::setDone(char const *reasonfmt, ...)
|
||||
void PlanetServer::setDone(char const reasonfmt, ...)
|
||||
{
|
||||
if (!m_done)
|
||||
{
|
||||
@@ -1472,7 +1472,8 @@ void PlanetServer::setDone(char const *reasonfmt, ...)
|
||||
"PlanetServer (pid %d) shutdown, reason: %s\n",
|
||||
static_cast<int>(Os::getProcessId()),
|
||||
reason));
|
||||
|
||||
|
||||
va_end(ap);
|
||||
m_done = true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -49,7 +49,7 @@ public:
|
||||
|
||||
static void run(void);
|
||||
void mainLoop(void);
|
||||
void setDone(char const *reasonfmt, ...);
|
||||
void setDone(char const reasonfmt, ...);
|
||||
|
||||
const unsigned short getGameServicePort() const;
|
||||
const Service * getGameService() const;
|
||||
|
||||
Reference in New Issue
Block a user