Changeset 14527

Timestamp:

May 9, 2015, 2:09:05 PM (6 years ago)

Author:

mikedld

Message:

Fix some issues revealed by coverity

Location:

trunk/libtransmission

Files:

• file-posix.c (modified) (2 diffs)
• net.c (modified) (1 diff)

trunk/libtransmission/file-posix.c

@@ -138 +138 @@
 #ifdef HAVE_POSIX_FADVISE
 
-  posix_fadvise (handle, 0, 0, POSIX_FADV_SEQUENTIAL);
+  (void) posix_fadvise (handle, 0, 0, POSIX_FADV_SEQUENTIAL);
 
 #endif
@@ -144 +144 @@
 #ifdef __APPLE__
 
-  fcntl (handle, F_RDAHEAD, 1);
-  fcntl (handle, F_NOCACHE, 1);
+  (void) fcntl (handle, F_RDAHEAD, 1);
+  (void) fcntl (handle, F_NOCACHE, 1);
 
 #endif

trunk/libtransmission/net.c

@@ -145 +145 @@
  **********************************************************************/
 
-int
+void
 tr_netSetTOS (tr_socket_t s,
               int         tos)
 {
 #ifdef IP_TOS
-    return setsockopt (s, IPPROTO_IP, IP_TOS, (const void *) &tos, sizeof (tos));
+    if (setsockopt (s, IPPROTO_IP, IP_TOS, (const void *) &tos, sizeof (tos)) != -1)
+        return;
 #else
-    return 0;
-#endif
-}
-
-int
-tr_netSetCongestionControl (tr_socket_t   s UNUSED,
-                            const char  * algorithm UNUSED)
+    (void) s;
+    errno = ENOSYS;
+#endif
+
+    tr_logAddNamedInfo ("Net", "Can't set TOS '%d': %s", tos, tr_strerror (errno));
+}
+
+void
+tr_netSetCongestionControl (tr_socket_t   s,
+                            const char  * algorithm)
 {
 #ifdef TCP_CONGESTION
-    return setsockopt (s, IPPROTO_TCP, TCP_CONGESTION,
-                       (const void *) algorithm, strlen (algorithm) + 1);
+    if (setsockopt (s, IPPROTO_TCP, TCP_CONGESTION,
+                    (const void *) algorithm, strlen (algorithm) + 1) != -1)
+        return;
+
 #else
+    (void) s;
     errno = ENOSYS;
-    return -1;
-#endif
+#endif
+
+    tr_logAddNamedInfo ("Net", "Can't set congestion control algorithm '%s': %s",
+                        algorithm, tr_strerror (errno));
 }