Silent gcc warnings with -Wconst-qual switch.

git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@598 36d66b0a-2a48-0410-832c-cd162a569da5

diff --git a/lib/internal.h b/lib/internal.h
index e20fe57..d574911 100644 (file)
--- a/lib/internal.h
+++ b/lib/internal.h
@@ -15,6 +15,9 @@
 #include "utils_loop.h"
 #include "utils_dm.h"
 
+/* to silent gcc -Wcast-qual for const cast */
+#define CONST_CAST(x) (x)(uintptr_t)
+
 #define SECTOR_SHIFT           9
 #define SECTOR_SIZE            (1 << SECTOR_SHIFT)
 #define DEFAULT_DISK_ALIGNMENT 1048576 /* 1MiB */

diff --git a/lib/libdevmapper.c b/lib/libdevmapper.c
index c239f87..fc80e97 100644 (file)
--- a/lib/libdevmapper.c
+++ b/lib/libdevmapper.c
@@ -244,11 +244,12 @@ static void hex_key(char *hexkey, size_t key_size, const char *key)
 static char *get_params(struct crypt_dm_active_device *dmd)
 {
        int r, max_size;
-       char *params, *hexkey, *features = "";
+       char *params, *hexkey;
+       const char *features = "";
 
        if (dmd->flags & CRYPT_ACTIVATE_ALLOW_DISCARDS) {
                if (dm_flags() & DM_DISCARDS_SUPPORTED) {
-                       features =" 1 allow_discards";
+                       features = " 1 allow_discards";
                        log_dbg("Discard/TRIM is allowed.");
                } else
                        log_dbg("Discard/TRIM is not supported by the kernel.");

diff --git a/lib/setup.c b/lib/setup.c
index e3586b1..0682027 100644 (file)
--- a/lib/setup.c
+++ b/lib/setup.c
@@ -288,7 +288,7 @@ int PLAIN_activate(struct crypt_device *cd,
 
        // FIXME
        if (!cd->plain_uuid && dm_query_device(name, DM_ACTIVE_UUID, &dmd) >= 0)
-               cd->plain_uuid = (char*)dmd.uuid;
+               cd->plain_uuid = CONST_CAST(char*)dmd.uuid;
 
        free(dm_cipher);
        return r;
@@ -600,7 +600,7 @@ int crypt_init_by_name_and_header(struct crypt_device **cd,
 
                /* Underlying device is not readable but crypt mapping exists */
                if (r == -ENOTBLK) {
-                       free((char*)dmd.device);
+                       free(CONST_CAST(void*)dmd.device);
                        dmd.device = NULL;
                        r = crypt_init(cd, NULL);
                }
@@ -691,9 +691,9 @@ out:
                *cd = NULL;
        }
        crypt_free_volume_key(dmd.vk);
-       free((char*)dmd.device);
-       free((char*)dmd.cipher);
-       free((char*)dmd.uuid);
+       free(CONST_CAST(void*)dmd.device);
+       free(CONST_CAST(void*)dmd.cipher);
+       free(CONST_CAST(void*)dmd.uuid);
        return r;
 }
 
@@ -964,9 +964,9 @@ int crypt_resize(struct crypt_device *cd, const char *name, uint64_t new_size)
        }
 out:
        crypt_free_volume_key(dmd.vk);
-       free((char*)dmd.cipher);
-       free((char*)dmd.device);
-       free((char*)dmd.uuid);
+       free(CONST_CAST(void*)dmd.cipher);
+       free(CONST_CAST(void*)dmd.device);
+       free(CONST_CAST(void*)dmd.uuid);
 
        return r;
 }
@@ -1051,13 +1051,13 @@ void crypt_free(struct crypt_device *cd)
                free(cd->type);
 
                /* used in plain device only */
-               free((char*)cd->plain_hdr.hash);
+               free(CONST_CAST(void*)cd->plain_hdr.hash);
                free(cd->plain_cipher);
                free(cd->plain_cipher_mode);
                free(cd->plain_uuid);
 
                /* used in loop-AES device only */
-               free((char*)cd->loopaes_hdr.hash);
+               free(CONST_CAST(void*)cd->loopaes_hdr.hash);
                free(cd->loopaes_cipher);
                free(cd->loopaes_uuid);
 
@@ -1261,7 +1261,7 @@ int crypt_keyslot_add_by_passphrase(struct crypt_device *cd,
                goto out;
 
        if (new_passphrase) {
-               new_password = (char *)new_passphrase;
+               new_password = CONST_CAST(char*)new_passphrase;
                new_passwordLen = new_passphrase_size;
        } else {
                r = key_from_terminal(cd, _("Enter new passphrase for key slot: "),