Fix a number of build warnings

11 files changed, 49 insertions, 28 deletions

diff --git a/admin b/admin
-Subproject 04db460623e1f235e7239f08fdcc2d0ef72636a
+Subproject 4dd97fad9e0c3f39abfd16d13e5b4c93d508513
diff --git a/tdecore/network/khttpproxysocketdevice.cpp b/tdecore/network/khttpproxysocketdevice.cpp
index e4529f28a..0c4947554 100644
--- a/tdecore/network/khttpproxysocketdevice.cpp
+++ b/tdecore/network/khttpproxysocketdevice.cpp
@@ -170,11 +170,14 @@ bool KHttpProxySocketDevice::connect(const TQString& node, const TQString& servi
 bool KHttpProxySocketDevice::parseServerReply()
 {
   // make sure we're connected
-  if (!TDESocketDevice::connect(d->proxy))
-    if (error() == InProgress)
+  if (!TDESocketDevice::connect(d->proxy)) {
+    if (error() == InProgress) {
       return true;
-    else if (error() != NoError)
+    }
+    else if (error() != NoError) {
       return false;
+    }
+  }
 
   if (!d->request.isEmpty())
     {
diff --git a/tdecore/network/kserversocket.cpp b/tdecore/network/kserversocket.cpp
index 16a48cdf2..e04d74b08 100644
--- a/tdecore/network/kserversocket.cpp
+++ b/tdecore/network/kserversocket.cpp
@@ -292,7 +292,7 @@ KActiveSocketBase* TDEServerSocket::accept()
 	}
       else if (!listen())
 	// error happened during listen
-	return false;
+	return 0L;
     }
 
   // check to see if we're doing a timeout
diff --git a/tdecore/network/tdesocketbuffer.cpp b/tdecore/network/tdesocketbuffer.cpp
index 33b8fe776..13c7c0447 100644
--- a/tdecore/network/tdesocketbuffer.cpp
+++ b/tdecore/network/tdesocketbuffer.cpp
@@ -183,7 +183,7 @@ TQ_LONG TDESocketBuffer::consumeBuffer(char *destbuffer, TQ_LONG maxlen, bool di
     {
       // calculate how much we'll copy
       size_t to_copy = (*it).size() - offset;
-      if (to_copy > maxlen)
+      if (to_copy > (size_t)maxlen)
 	to_copy = maxlen;
 
       // do the copying
@@ -234,12 +234,12 @@ TQ_LONG TDESocketBuffer::sendTo(KActiveSocketBase* dev, TQ_LONG len)
     return 0;
 
   TQMutexLocker locker(&m_mutex);
-  
+
   TQValueListIterator<TQByteArray> it = m_list.begin(),
     end = m_list.end();
   TQIODevice::Offset offset = m_offset;
   TQ_LONG written = 0;
-  
+
   // walk the buffer
   while (it != end && (len || len == -1))
     {
@@ -249,8 +249,9 @@ TQ_LONG TDESocketBuffer::sendTo(KActiveSocketBase* dev, TQ_LONG len)
       // question is: how big should that buffer be? 2 kB should be enough
 
       TQ_ULONG bufsize = 1460;
-      if (len != -1 && len < bufsize)
+      if ((len != -1) && ((TQ_ULONG)len < bufsize)) {
 	bufsize = len;
+      }
       TQByteArray buf(bufsize);
       TQ_LONG count = 0;
 
@@ -263,7 +264,7 @@ TQ_LONG TDESocketBuffer::sendTo(KActiveSocketBase* dev, TQ_LONG len)
 	}
 
       // see if we can still fit more
-      if (count < bufsize && it != end)
+      if ((TQ_ULONG)count < bufsize && it != end)
 	{
 	  // getting here means this buffer (*it) is larger than
 	  // (bufsize - count) (even for count == 0).
diff --git a/tdeio/bookmarks/kbookmark.cc b/tdeio/bookmarks/kbookmark.cc
index 8bbaa5e43..0da05be4f 100644
--- a/tdeio/bookmarks/kbookmark.cc
+++ b/tdeio/bookmarks/kbookmark.cc
@@ -296,16 +296,21 @@ KURL KBookmark::url() const
 TQString KBookmark::icon() const
 {
     TQString icon = element.attribute("icon");
-    if ( icon.isEmpty() )
+    if ( icon.isEmpty() ) {
         // Default icon depends on URL for bookmarks, and is default directory
         // icon for groups.
-        if ( isGroup() )
+        if ( isGroup() ) {
             icon = "bookmark_folder";
-        else
-            if ( isSeparator() )
+	}
+        else {
+            if ( isSeparator() ) {
                 icon = "eraser"; // whatever
-            else
+	    }
+            else {
                 icon = KMimeType::iconForURL( url() );
+	    }
+	}
+    }
     return icon;
 }
 
diff --git a/tdeio/bookmarks/kbookmarkmanager.cc b/tdeio/bookmarks/kbookmarkmanager.cc
index 60d4f2932..47f8c152a 100644
--- a/tdeio/bookmarks/kbookmarkmanager.cc
+++ b/tdeio/bookmarks/kbookmarkmanager.cc
@@ -255,6 +255,7 @@ void KBookmarkManager::convertToXBEL( TQDomElement & group )
     {
         TQDomElement e = n.toElement();
         if ( !e.isNull() )
+	{
             if ( e.tagName() == "TEXT" )
             {
                 e.setTagName("title");
@@ -280,6 +281,7 @@ void KBookmarkManager::convertToXBEL( TQDomElement & group )
                 convertToXBEL( e );
             }
             else
+	    {
                 if ( e.tagName() == "BOOKMARK" )
                 {
                     e.setTagName("bookmark"); // so much difference :-)
@@ -294,7 +296,11 @@ void KBookmarkManager::convertToXBEL( TQDomElement & group )
                     titleElem.appendChild( e.ownerDocument().createTextNode( text ) );
                 }
                 else
+		{
                     kdWarning(7043) << "Unknown tag " << e.tagName() << endl;
+		}
+	    }
+	}
         n = n.nextSibling();
     }
 }
diff --git a/tdeio/tdeio/forwardingslavebase.cpp b/tdeio/tdeio/forwardingslavebase.cpp
index e86aaef88..c4e4daa0c 100644
--- a/tdeio/tdeio/forwardingslavebase.cpp
+++ b/tdeio/tdeio/forwardingslavebase.cpp
@@ -69,7 +69,6 @@ void ForwardingSlaveBase::prepareUDSEntry(TDEIO::UDSEntry &entry,
     kdDebug() << "ForwardingSlaveBase::prepareUDSEntry: listing=="
               << listing << endl;
 
-    bool url_found = false;
     TQString name;
     KURL url;
 
@@ -87,7 +86,6 @@ void ForwardingSlaveBase::prepareUDSEntry(TDEIO::UDSEntry &entry,
             kdDebug() << "Name = " << name << endl;
 	    break;
         case TDEIO::UDS_URL:
-            url_found = true;
             url = (*it).m_str;
 	    if (listing)
             {
diff --git a/tdeio/tdeio/job.cpp b/tdeio/tdeio/job.cpp
index 250d3d34e..f6156a966 100644
--- a/tdeio/tdeio/job.cpp
+++ b/tdeio/tdeio/job.cpp
@@ -4308,7 +4308,7 @@ void DeleteJob::slotResult( Job *job )
          UDSEntry entry = ((StatJob*)job)->statResult();
          bool bDir = false;
          bool bLink = false;
-         TDEIO::filesize_t size = (TDEIO::filesize_t)-1;
+//         TDEIO::filesize_t size = (TDEIO::filesize_t)-1;
          UDSEntry::ConstIterator it2 = entry.begin();
          int atomsFound(0);
          for( ; it2 != entry.end(); it2++ )
@@ -4325,7 +4325,7 @@ void DeleteJob::slotResult( Job *job )
             }
             else if ( ((*it2).m_uds) == UDS_SIZE )
             {
-               size = (*it2).m_long;
+//               size = (*it2).m_long;
                atomsFound++;
             }
             if (atomsFound==3) break;
diff --git a/tdeio/tdeio/kzip.cpp b/tdeio/tdeio/kzip.cpp
index 91f36a085..bafb174eb 100644
--- a/tdeio/tdeio/kzip.cpp
+++ b/tdeio/tdeio/kzip.cpp
@@ -627,9 +627,9 @@ kdDebug(7040) << "dev->at() now : " << dev->at() << endl;
 		    else
 		    {
 // 			kdDebug(7040) << "before interesting dev->at(): " << dev->at() << endl;
-			bool success;
+/*			bool success;
 			success = dev->at( dev->at() + compr_size ); // can this fail ???
-/*			kdDebug(7040) << "after interesting dev->at(): " << dev->at() << endl;
+			kdDebug(7040) << "after interesting dev->at(): " << dev->at() << endl;
 			if ( success )
 				kdDebug(7040) << "dev->at was successful... " << endl;
 			else
diff --git a/tdeio/tdeio/slavebase.cpp b/tdeio/tdeio/slavebase.cpp
index cb071fc05..aa98c41d3 100644
--- a/tdeio/tdeio/slavebase.cpp
+++ b/tdeio/tdeio/slavebase.cpp
@@ -734,21 +734,25 @@ void SlaveBase::sigsegv_handler(int sig)
     // call malloc.. and get in a nice recursive malloc loop
     char buffer[120];
     snprintf(buffer, sizeof(buffer), "tdeioslave: ####### CRASH ###### protocol = %s pid = %d signal = %d\n", s_protocol, getpid(), sig);
-    write(2, buffer, strlen(buffer));
+    if (write(2, buffer, strlen(buffer)) >= 0) {
 #ifdef SECURE_DEBUG
 	kdBacktraceFD();
 #else // SECURE_DEBUG
-	// Screw the malloc issue! We want nice demangled backtrace! 
+	// Screw the malloc issue! We want nice demangled backtraces!
 	// Anyway we are not supposed to go into infinite loop because next signal
-	// will kill us. If you are unlucky and  there is a second crash during 
-	// backtrase in your system, you can define SECURE_DEBUG to avoid it 
+	// will kill us. If you are unlucky and  there is a second crash during
+	// backtrase in your system, you can define SECURE_DEBUG to avoid it
 
 	// Extra sync here so we are sure even if the backtrace will fail
 	// we will pass at least some crash message.
 	fsync(2);
 	TQString backtrace = kdBacktrace();
-	write(2, backtrace.ascii(), backtrace.length());
+	if (write(2, backtrace.ascii(), backtrace.length()) < 0) {
+		// FIXME
+		// Could not write crash information
+	}
 #endif // SECURE_DEBUG
+    }
     ::exit(1);
 #endif
 }
diff --git a/tdeio/tdeio/slaveinterface.cpp b/tdeio/tdeio/slaveinterface.cpp
index 6de70b57f..47f935cda 100644
--- a/tdeio/tdeio/slaveinterface.cpp
+++ b/tdeio/tdeio/slaveinterface.cpp
@@ -533,11 +533,15 @@ void SlaveInterface::sigpipe_handler(int)
 {
     int saved_errno = errno;
     // Using kdDebug from a signal handler is not a good idea.
-#ifndef NDEBUG    
+#ifndef NDEBUG
     char msg[1000];
     sprintf(msg, "*** SIGPIPE *** (ignored, pid = %ld)\n", (long) getpid());
-    write(2, msg, strlen(msg));
-#endif    
+    if (write(2, msg, strlen(msg)) < 0) {
+        // FIXME
+        // Could not write error message
+        // Triple fault? ;-)
+    }
+#endif
 
     // Do nothing.
     // dispatch will return false and that will trigger ERR_SLAVE_DIED in slave.cpp