[PATCH 07/19] sd-daemon: fix cppcheck warnings

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



[misc-utils/sd-daemon.c:91]: (style) Checking if unsigned variable 'l' is \
less than zero.
[misc-utils/sd-daemon.c:254]: (warning) Comparison of a boolean \
expression with an integer.
[misc-utils/sd-daemon.c:363]: (style) Checking if unsigned variable \
'length' is less than zero.
[misc-utils/sd-daemon.c:366]: (style) Checking if unsigned variable \
'length' is less than zero.

Signed-off-by: Sami Kerola <kerolasa@xxxxxx>
---
 misc-utils/sd-daemon.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/misc-utils/sd-daemon.c b/misc-utils/sd-daemon.c
index 763e079..21399e2 100644
--- a/misc-utils/sd-daemon.c
+++ b/misc-utils/sd-daemon.c
@@ -88,7 +88,7 @@ _sd_export_ int sd_listen_fds(int unset_environment) {
                 goto finish;
         }
 
-        if (!p || *p || l <= 0) {
+	if (!p || *p || l == 0) {
                 r = -EINVAL;
                 goto finish;
         }
@@ -251,7 +251,7 @@ static int sd_is_socket_internal(int fd, int type, int listening) {
                 if (l != sizeof(accepting))
                         return -EINVAL;
 
-                if (!accepting != !listening)
+		if ((!accepting) != (!listening))
                         return 0;
         }
 
@@ -360,10 +360,10 @@ _sd_export_ int sd_is_socket_unix(int fd, int type, int listening, const char *p
                 return 0;
 
         if (path) {
-                if (length <= 0)
+		if (length == 0)
                         length = strlen(path);
 
-                if (length <= 0)
+		if (length == 0)
                         /* Unnamed socket */
                         return l == offsetof(struct sockaddr_un, sun_path);
 
-- 
1.7.12.2

--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Netdev]     [Ethernet Bridging]     [Linux Wireless]     [Kernel Newbies]     [Security]     [Linux for Hams]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux RAID]     [Linux Admin]     [Samba]

  Powered by Linux