Skip to content

Strict g++ compiler warning #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rbcouture-csiflex wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Strict g++ compiler warning #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f90336e
Fix some Unix warning
rbcouture-csiflex Feb 9, 2016
e170dc4
Fix some Unix warnings
rbcouture-csiflex Feb 9, 2016
8430c8e
Revert to forked
rbcouture-csiflex Feb 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/condition.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ bool Condition::unavailable()
return add(eUNAVAILABLE);
}

char *Condition::toString(char *aBuffer, int aMaxLen)
char *Condition::toString(char*, int)
{
return NULL;
}
Expand Down
2 changes: 1 addition & 1 deletion src/logger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions src/server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/service.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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*[])
{
}

Expand Down
2 changes: 1 addition & 1 deletion src/string_buffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down