Open Source Projects Europe

--- a/src/utils/netcon.cpp
+++ b/src/utils/netcon.cpp
@@ -72,10 +72,11 @@
 static const int one = 1;
 static const int zero = 0;
 
+#ifndef LOGSYSERR
 #define LOGSYSERR(who, call, spar)                                \
     LOGERR(who << ": "  << call << "("  << spar << ") errno " <<  \
            errno << " ("  << strerror(errno) << ")\n")
-
+#endif
 #ifndef MIN
 #define MIN(a,b) ((a)<(b)?(a):(b))
 #endif
@@ -700,7 +701,10 @@
 {
     if (m_wkfds[1] >= 0) {
         LOGDEB2("NetconData::cancelReceive: writing to " << m_wkfds[1] << endl);
-        ::write(m_wkfds[1], "!", 1);
+        // We can't do a thing about the ::write return value, the
+        // following nonsense is for cancelling warnings
+        int ret = ::write(m_wkfds[1], "!", 1);
+        ret = ret;
     }
 }
 
@@ -749,7 +753,10 @@
         
         if (cancellable && FD_ISSET(m_wkfds[0], &rd)) {
             char b[100];
-            read(m_wkfds[0], b, 100);
+            // We can't do a thing about the return value, the
+            // following nonsense is for cancelling warnings
+            int ret = ::read(m_wkfds[0], b, 100);
+            ret = ret;
             return Cancelled;
         }