p11-kit: Fix various noise/issues highlighted by clang

diff --git a/p11-kit/modules.c b/p11-kit/modules.c
index ce0fb96ca4adb4bddd8cd34d21435b606be73b73..bc6f768569ea3d49650629e70dfd9770d405f1f1 100644 (file)
--- a/p11-kit/modules.c
+++ b/p11-kit/modules.c
@@ -511,7 +511,6 @@ take_config_and_load_module_inlock (char **name,
        if (isolated) {
                if (remote) {
                        p11_message ("ignoring 'isolated' on module '%s' because 'remote' is set", *name);
-                       isolated = false;
                } else {
                        if (asprintf (&value, "|" BINDIR "/p11-kit remote '%s'", filename) < 0)
                                return_val_if_reached (CKR_DEVICE_ERROR);

diff --git a/p11-kit/remote.c b/p11-kit/remote.c
index 706d8b80b821ffba5ec71fa8778b125cee1daf3d..944e5010bd99dd1ba038279327a8af4d4bbcb72b 100644 (file)
--- a/p11-kit/remote.c
+++ b/p11-kit/remote.c
@@ -72,8 +72,7 @@ p11_kit_remote_serve_module (CK_FUNCTION_LIST *module,
 
        switch (read (in_fd, &version, 1)) {
        case 0:
-               status = P11_RPC_EOF;
-               break;
+               goto out;
        case 1:
                if (version != 0) {
                        p11_message ("unspported version received: %d", (int)version);

diff --git a/p11-kit/rpc-client.c b/p11-kit/rpc-client.c
index 810ef1226d736276a21c4f10b22f87d786dd0851..23cfcfcdf2efcf5800552651b533181c0100bbbe 100644 (file)
--- a/p11-kit/rpc-client.c
+++ b/p11-kit/rpc-client.c
@@ -198,8 +198,8 @@ proto_read_attribute_array (p11_rpc_message *msg,
 {
        uint32_t i, num, value, type;
        CK_ATTRIBUTE_PTR attr;
-       const unsigned char *attrval;
-       size_t attrlen;
+       const unsigned char *attrval = NULL;
+       size_t attrlen = 0;
        unsigned char validity;
        CK_RV ret;
 

diff --git a/p11-kit/rpc-server.c b/p11-kit/rpc-server.c
index a468e7a9657471ed3b9ac2ef3811db85a3ccf69d..b8288c9733f56a3354821cc7066d4a04ce8c1eb3 100644 (file)
--- a/p11-kit/rpc-server.c
+++ b/p11-kit/rpc-server.c
@@ -681,16 +681,18 @@ rpc_C_Initialize (CK_X_FUNCTION_LIST *self,
                assert (p11_rpc_message_is_verified (msg));
        }
 
-       memset (&init_args, 0, sizeof (init_args));
-       init_args.flags = CKF_OS_LOCKING_OK;
+       if (ret == CKR_OK) {
+               memset (&init_args, 0, sizeof (init_args));
+               init_args.flags = CKF_OS_LOCKING_OK;
 
-       func = self->C_Initialize;
-       assert (func != NULL);
-       ret = (func) (self, &init_args);
+               func = self->C_Initialize;
+               assert (func != NULL);
+               ret = (func) (self, &init_args);
 
-       /* Empty response */
-       if (ret == CKR_OK)
-               ret = call_ready (msg);
+               /* Empty response */
+               if (ret == CKR_OK)
+                       ret = call_ready (msg);
+       }
 
        p11_debug ("ret: %d", (int)ret);
        return ret;