From f90336ee45705e765c653691f4d2e162f60d16ce Mon Sep 17 00:00:00 2001 From: Remi Bedard-Couture Date: Tue, 9 Feb 2016 09:36:20 -0500 Subject: [PATCH 1/3] Fix some Unix warning --- src/condition.cpp | 3 ++- src/condition.hpp | 4 ++-- src/logger.cpp | 2 +- src/server.cpp | 4 ++-- src/service.cpp | 4 ++-- src/string_buffer.cpp | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/condition.cpp b/src/condition.cpp index dd85beb..8cd2fff 100644 --- a/src/condition.cpp +++ b/src/condition.cpp @@ -38,7 +38,8 @@ bool Condition::unavailable() return add(eUNAVAILABLE); } -char *Condition::toString(char *aBuffer, int aMaxLen) +//char *Condition::toString(char *aBuffer, int aMaxLen) +char *Condition::toString(char*, int) { return NULL; } diff --git a/src/condition.hpp b/src/condition.hpp index 04faa4d..7ebcaa5 100644 --- a/src/condition.hpp +++ b/src/condition.hpp @@ -77,7 +77,7 @@ class Condition : public DeviceDatum bool setValue(ELevels aLevel, const char *aText = "", const char *aCode = "", const char *aQualifier = "", const char *aSeverity = ""); - char *toString(char *aBuffer, int aMaxLen); + char *toString(char *aBuffer, int aMaxLen); bool hasChanged() { return mChanged; } ELevels getLevel() { return mLevel; } @@ -111,7 +111,7 @@ class Condition : public DeviceDatum public: Condition(const char *aName = "", bool aSimple = false); virtual ~Condition(); - virtual char *toString(char *aBuffer, int aMaxLen); + virtual char *toString(char *aBuffer, int aMaxLen); virtual bool requiresFlush(); virtual bool unavailable(); diff --git a/src/logger.cpp b/src/logger.cpp index 597978a..38a0b6b 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -76,7 +76,7 @@ const char *Logger::timestamp(char *aBuffer) gettimeofday(&tv, &tz); strftime(aBuffer, 64, "%Y-%m-%dT%H:%M:%S", gmtime(&tv.tv_sec)); - sprintf(aBuffer + strlen(aBuffer), ".%06dZ", tv.tv_usec); + sprintf(aBuffer + strlen(aBuffer), ".%06ldZ", tv.tv_usec); #endif return aBuffer; diff --git a/src/server.cpp b/src/server.cpp index 676e055..6676d97 100755 --- a/src/server.cpp +++ b/src/server.cpp @@ -211,7 +211,7 @@ Client *Server::connectToClients() ::memset(&timeout, 0, sizeof(timeout)); Client *client = NULL; - bool added = false; + //bool added = false; if (::select(nfds, &rset, 0, 0, &timeout) > 0) { @@ -230,7 +230,7 @@ Client *Server::connectToClients() ::setsockopt(socket, IPPROTO_TCP, TCP_NODELAY, (const char*) &flag, sizeof(int)); client = addClient(new Client(socket)); - added = true; + //added = true; } return client; diff --git a/src/service.cpp b/src/service.cpp index 0a008ef..c03c8e8 100644 --- a/src/service.cpp +++ b/src/service.cpp @@ -12,7 +12,7 @@ void MTConnectService::setName(const char *aName) mName[79] = '\0'; } -void MTConnectService::initialize(int aArgc, const char *aArgv[]) +void MTConnectService::initialize(int, const char**) { if (gLogger == NULL) { if (mIsService) @@ -578,7 +578,7 @@ int MTConnectService::main(int argc, const char *argv[]) return 0; } -void MTConnectService::install(int argc, const char *argv[]) +void MTConnectService::install(int, const char*[]) { } diff --git a/src/string_buffer.cpp b/src/string_buffer.cpp index e582230..6fa9ea7 100755 --- a/src/string_buffer.cpp +++ b/src/string_buffer.cpp @@ -113,7 +113,7 @@ void StringBuffer::timestamp() gettimeofday(&tv, &tz); strftime(mTimestamp, 64, "%Y-%m-%dT%H:%M:%S", gmtime(&tv.tv_sec)); - sprintf(mTimestamp + strlen(mTimestamp), ".%06dZ", tv.tv_usec); + sprintf(mTimestamp + strlen(mTimestamp), ".%06ldZ", tv.tv_usec); #endif } From e170dc47283f31ee159464a477ccdf80fe0f5ec4 Mon Sep 17 00:00:00 2001 From: Remi Bedard-Couture Date: Tue, 9 Feb 2016 09:46:09 -0500 Subject: [PATCH 2/3] Fix some Unix warnings --- src/condition.cpp | 1 - src/server.cpp | 2 -- 2 files changed, 3 deletions(-) diff --git a/src/condition.cpp b/src/condition.cpp index 8cd2fff..742ae9a 100644 --- a/src/condition.cpp +++ b/src/condition.cpp @@ -38,7 +38,6 @@ bool Condition::unavailable() return add(eUNAVAILABLE); } -//char *Condition::toString(char *aBuffer, int aMaxLen) char *Condition::toString(char*, int) { return NULL; diff --git a/src/server.cpp b/src/server.cpp index 6676d97..47f8ef8 100755 --- a/src/server.cpp +++ b/src/server.cpp @@ -211,7 +211,6 @@ Client *Server::connectToClients() ::memset(&timeout, 0, sizeof(timeout)); Client *client = NULL; - //bool added = false; if (::select(nfds, &rset, 0, 0, &timeout) > 0) { @@ -230,7 +229,6 @@ Client *Server::connectToClients() ::setsockopt(socket, IPPROTO_TCP, TCP_NODELAY, (const char*) &flag, sizeof(int)); client = addClient(new Client(socket)); - //added = true; } return client; From 8430c8e28866e659a5a798856b5d794557e5010e Mon Sep 17 00:00:00 2001 From: Remi Bedard-Couture Date: Tue, 9 Feb 2016 09:51:49 -0500 Subject: [PATCH 3/3] Revert to forked --- src/condition.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/condition.hpp b/src/condition.hpp index 7ebcaa5..04faa4d 100644 --- a/src/condition.hpp +++ b/src/condition.hpp @@ -77,7 +77,7 @@ class Condition : public DeviceDatum bool setValue(ELevels aLevel, const char *aText = "", const char *aCode = "", const char *aQualifier = "", const char *aSeverity = ""); - char *toString(char *aBuffer, int aMaxLen); + char *toString(char *aBuffer, int aMaxLen); bool hasChanged() { return mChanged; } ELevels getLevel() { return mLevel; } @@ -111,7 +111,7 @@ class Condition : public DeviceDatum public: Condition(const char *aName = "", bool aSimple = false); virtual ~Condition(); - virtual char *toString(char *aBuffer, int aMaxLen); + virtual char *toString(char *aBuffer, int aMaxLen); virtual bool requiresFlush(); virtual bool unavailable();