[gnome-keyring] Fix issues highlighted by GCC 5.0.x



commit 2411d155e180da712c53eb0d67e4a5eaaea214b3
Author: Stef Walter <stefw gnome org>
Date:   Mon Mar 23 10:25:44 2015 +0100

    Fix issues highlighted by GCC 5.0.x

 daemon/control/gkd-control-server.c |    2 +-
 egg/egg-dn.c                        |    2 +-
 pkcs11/gkm/gkm-transaction.c        |    2 +-
 pkcs11/rpc-layer/gkm-rpc-dispatch.c |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/daemon/control/gkd-control-server.c b/daemon/control/gkd-control-server.c
index 65a1b04..11254fe 100644
--- a/daemon/control/gkd-control-server.c
+++ b/daemon/control/gkd-control-server.c
@@ -431,7 +431,7 @@ gkd_control_listen (void)
                return FALSE;
        }
 
-       if (!egg_unix_credentials_setup (sock) < 0) {
+       if (egg_unix_credentials_setup (sock) < 0) {
                close (sock);
                return FALSE;
        }
diff --git a/egg/egg-dn.c b/egg/egg-dn.c
index 1c38eac..4bd9201 100644
--- a/egg/egg-dn.c
+++ b/egg/egg-dn.c
@@ -227,7 +227,7 @@ egg_dn_read_part (GNode *asn, const gchar *match)
                        /* Does it match either the OID or the displayable? */
                        if (g_ascii_strcasecmp (g_quark_to_string (oid), match) != 0) {
                                name = egg_oid_get_name (oid);
-                               if (!g_ascii_strcasecmp (name, match) == 0)
+                               if (g_ascii_strcasecmp (name, match) == 0)
                                        continue;
                        }
 
diff --git a/pkcs11/gkm/gkm-transaction.c b/pkcs11/gkm/gkm-transaction.c
index 43d0cc0..df74871 100644
--- a/pkcs11/gkm/gkm-transaction.c
+++ b/pkcs11/gkm/gkm-transaction.c
@@ -628,7 +628,7 @@ gkm_transaction_unique_file (GkmTransaction *self, const gchar *directory,
        g_return_val_if_fail (basename, NULL);
        g_return_val_if_fail (!gkm_transaction_get_failed (self), NULL);
 
-       if (!g_mkdir_with_parents (directory, S_IRWXU) < 0) {
+       if (g_mkdir_with_parents (directory, S_IRWXU) < 0) {
                g_warning ("couldn't create directory: %s: %s", directory, g_strerror (errno));
                gkm_transaction_fail (self, CKR_DEVICE_ERROR);
                return NULL;
diff --git a/pkcs11/rpc-layer/gkm-rpc-dispatch.c b/pkcs11/rpc-layer/gkm-rpc-dispatch.c
index 4ffaf12..0f0cb8a 100644
--- a/pkcs11/rpc-layer/gkm-rpc-dispatch.c
+++ b/pkcs11/rpc-layer/gkm-rpc-dispatch.c
@@ -2087,7 +2087,7 @@ run_dispatch_loop (int sock)
 
        assert (sock != -1);
 
-       if (!egg_unix_credentials_read (sock, &pid, &uid) < 0) {
+       if (egg_unix_credentials_read (sock, &pid, &uid) < 0) {
                gkm_rpc_warn ("couldn't read socket credentials");
                return;
        }


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