You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2009/07/20 12:41:29 UTC
svn commit: r795752 - in /qpid/trunk/qpid/cpp/src:
qmf/ResilientConnection.cpp qpid/broker/Daemon.cpp
qpid/sys/posix/LockFile.cpp tests/ForkedBroker.cpp
Author: gsim
Date: Mon Jul 20 10:41:29 2009
New Revision: 795752
URL: http://svn.apache.org/viewvc?rev=795752&view=rev
Log:
QPID-1993: Patch from Chenta Lee to prevent compiler warnings with GCC 4.3.3
Modified:
qpid/trunk/qpid/cpp/src/qmf/ResilientConnection.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/Daemon.cpp
qpid/trunk/qpid/cpp/src/qpid/sys/posix/LockFile.cpp
qpid/trunk/qpid/cpp/src/tests/ForkedBroker.cpp
Modified: qpid/trunk/qpid/cpp/src/qmf/ResilientConnection.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/ResilientConnection.cpp?rev=795752&r1=795751&r2=795752&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf/ResilientConnection.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qmf/ResilientConnection.cpp Mon Jul 20 10:41:29 2009
@@ -385,7 +385,10 @@
eventQueue.push_back(event);
if (notifyFd != -1)
- ::write(notifyFd, ".", 1);
+ {
+ int unused_ret; //Suppress warnings about ignoring return value.
+ unused_ret = ::write(notifyFd, ".", 1);
+ }
}
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Daemon.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Daemon.cpp?rev=795752&r1=795751&r2=795752&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Daemon.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Daemon.cpp Mon Jul 20 10:41:29 2009
@@ -87,10 +87,11 @@
catch (const exception& e) {
QPID_LOG(critical, "Daemon startup failed: " << e.what());
uint16_t port = 0;
- write(pipeFds[1], &port, sizeof(uint16_t));
+ int unused_ret; //Supress warning about ignoring return value.
+ unused_ret = write(pipeFds[1], &port, sizeof(uint16_t));
std::string pipeFailureMessage = e.what();
- write ( pipeFds[1],
+ unused_ret = write ( pipeFds[1],
pipeFailureMessage.c_str(),
strlen(pipeFailureMessage.c_str())
);
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/posix/LockFile.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/posix/LockFile.cpp?rev=795752&r1=795751&r2=795752&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/posix/LockFile.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/posix/LockFile.cpp Mon Jul 20 10:41:29 2009
@@ -56,7 +56,8 @@
if (impl) {
int f = impl->fd;
if (f >= 0) {
- (void) ::lockf(f, F_ULOCK, 0); // Suppress warnings about ignoring return value.
+ int unused_ret;
+ unused_ret = ::lockf(f, F_ULOCK, 0); // Suppress warnings about ignoring return value.
::close(f);
impl->fd = -1;
}
Modified: qpid/trunk/qpid/cpp/src/tests/ForkedBroker.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/ForkedBroker.cpp?rev=795752&r1=795751&r2=795752&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/ForkedBroker.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/ForkedBroker.cpp Mon Jul 20 10:41:29 2009
@@ -51,7 +51,10 @@
QPID_LOG(error, QPID_MSG("Killing forked broker: " << e.what()));
}
if (!dataDir.empty())
- ::system(("rm -rf "+dataDir).c_str());
+ {
+ int unused_ret; // Suppress warnings about ignoring return value.
+ unused_ret = ::system(("rm -rf "+dataDir).c_str());
+ }
}
void ForkedBroker::kill(int sig) {
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org