Remove const usage from destroy callbacks

As const segment_type or const format_type are never released
use their non-const version and remove const downcast from dm_free calls.
This change fixes many gcc warnings we were getting from them.

diff --git a/lib/error/errseg.c b/lib/error/errseg.c
index 6cfcd794b430f5bd36ec5f8649472b42b9c8d060..add1df8cb7b2c37f2518b5cf9aac1b3d5b82fcf2 100644 (file)
--- a/lib/error/errseg.c
+++ b/lib/error/errseg.c
@@ -81,9 +81,9 @@ static int _errseg_modules_needed(struct dm_pool *mem,
        return 1;
 }
 
-static void _errseg_destroy(const struct segment_type *segtype)
+static void _errseg_destroy(struct segment_type *segtype)
 {
-       dm_free((void *)segtype);
+       dm_free(segtype);
 }
 
 static struct segtype_handler _error_ops = {

diff --git a/lib/format1/format1.c b/lib/format1/format1.c
index 0dcec053d8a633a27d8930718b9f2cc5a4dead1a..b35bd9874c457ed6de7e5cbee2772c2c862f4100 100644 (file)
--- a/lib/format1/format1.c
+++ b/lib/format1/format1.c
@@ -555,9 +555,9 @@ static void _format1_destroy_instance(struct format_instance *fid __attribute__(
 {
 }
 
-static void _format1_destroy(const struct format_type *fmt)
+static void _format1_destroy(struct format_type *fmt)
 {
-       dm_free((void *) fmt);
+       dm_free(fmt);
 }
 
 static struct format_handler _format1_ops = {

diff --git a/lib/format_pool/format_pool.c b/lib/format_pool/format_pool.c
index 545195bb75e21b7cefda436274d185e26730adbb..730da87f5e01c57bc5094128508fdd2b02257980 100644 (file)
--- a/lib/format_pool/format_pool.c
+++ b/lib/format_pool/format_pool.c
@@ -286,9 +286,9 @@ static void _pool_destroy_instance(struct format_instance *fid __attribute__((un
 {
 }
 
-static void _pool_destroy(const struct format_type *fmt)
+static void _pool_destroy(struct format_type *fmt)
 {
-       dm_free((void *) fmt);
+       dm_free(fmt);
 }
 
 /* *INDENT-OFF* */

diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c
index caab9236bf53b883bf1436d663e0ad4a18b901f5..c186757eeea823fb243b11a79cbc07b4843595d7 100644 (file)
--- a/lib/format_text/format-text.c
+++ b/lib/format_text/format-text.c
@@ -1719,7 +1719,7 @@ static void _free_raws(struct dm_list *raw_list)
        }
 }
 
-static void _text_destroy(const struct format_type *fmt)
+static void _text_destroy(struct format_type *fmt)
 {
        if (fmt->private) {
                _free_dirs(&((struct mda_lists *) fmt->private)->dirs);
@@ -1727,7 +1727,7 @@ static void _text_destroy(const struct format_type *fmt)
                dm_free(fmt->private);
        }
 
-       dm_free((void *)fmt);
+       dm_free(fmt);
 }
 
 static struct metadata_area_ops _metadata_text_file_ops = {

diff --git a/lib/freeseg/freeseg.c b/lib/freeseg/freeseg.c
index 08f310067d89176a7200c533a902536f1e47f1f9..8e73be0c6feb6fe862c0506ef5cda5c8984bd3d9 100644 (file)
--- a/lib/freeseg/freeseg.c
+++ b/lib/freeseg/freeseg.c
@@ -31,9 +31,9 @@ static const char *_freeseg_name(const struct lv_segment *seg)
        return seg->segtype->name;
 }
 
-static void _freeseg_destroy(const struct segment_type *segtype)
+static void _freeseg_destroy(struct segment_type *segtype)
 {
-       dm_free((void *)segtype);
+       dm_free(segtype);
 }
 
 static struct segtype_handler _freeseg_ops = {

diff --git a/lib/metadata/metadata.h b/lib/metadata/metadata.h
index 815e4600ad5410e14df151740ace8539b7446378..08bff4a7e6d69f79e3fa54f96b5917b064853e97 100644 (file)
--- a/lib/metadata/metadata.h
+++ b/lib/metadata/metadata.h
@@ -291,7 +291,7 @@ struct format_handler {
        /*
         * Destructor for format type
         */
-       void (*destroy) (const struct format_type * fmt);
+       void (*destroy) (struct format_type * fmt);
 };
 
 /*

diff --git a/lib/metadata/segtype.h b/lib/metadata/segtype.h
index 8bf16d7409a845ef6fd6b3c5610281b76de88058..6d50746b2e4b92b13dfa528b5c1896f0e22f4899 100644 (file)
--- a/lib/metadata/segtype.h
+++ b/lib/metadata/segtype.h
@@ -97,7 +97,7 @@ struct segtype_handler {
        int (*modules_needed) (struct dm_pool *mem,
                               const struct lv_segment *seg,
                               struct dm_list *modules);
-       void (*destroy) (const struct segment_type * segtype);
+       void (*destroy) (struct segment_type * segtype);
        int (*target_monitored) (struct lv_segment *seg, int *pending);
        int (*target_monitor_events) (struct lv_segment *seg, int events);
        int (*target_unmonitor_events) (struct lv_segment *seg, int events);

diff --git a/lib/mirror/mirrored.c b/lib/mirror/mirrored.c
index a02ccb5af347dbc8de55d7d195ed78198269dc79..3d25d7092439e518a276a29021f64e1442b185d6 100644 (file)
--- a/lib/mirror/mirrored.c
+++ b/lib/mirror/mirrored.c
@@ -600,9 +600,9 @@ static int _mirrored_modules_needed(struct dm_pool *mem,
        return 1;
 }
 
-static void _mirrored_destroy(const struct segment_type *segtype)
+static void _mirrored_destroy(struct segment_type *segtype)
 {
-       dm_free((void *) segtype);
+       dm_free(segtype);
 }
 
 static struct segtype_handler _mirrored_ops = {

diff --git a/lib/replicator/replicator.c b/lib/replicator/replicator.c
index 1753bcafaee1e07bf5b033ba1ea94acde0be6fc5..26a5cf1c04eaea7da04e8592933c78dcca2f518d 100644 (file)
--- a/lib/replicator/replicator.c
+++ b/lib/replicator/replicator.c
@@ -406,9 +406,9 @@ static int _replicator_modules_needed(struct dm_pool *mem,
        return 1;
 }
 
-static void _replicator_destroy(const struct segment_type *segtype)
+static void _replicator_destroy(struct segment_type *segtype)
 {
-       dm_free((void *)segtype);
+       dm_free(segtype);
 }
 
 static struct segtype_handler _replicator_ops = {

diff --git a/lib/snapshot/snapshot.c b/lib/snapshot/snapshot.c
index e1612f9929045015484de956403593f9e6e8acda..1a98d7e0d993c1f8677840b7d3f9d6c437c07849 100644 (file)
--- a/lib/snapshot/snapshot.c
+++ b/lib/snapshot/snapshot.c
@@ -218,9 +218,9 @@ static int _snap_modules_needed(struct dm_pool *mem,
        return 1;
 }
 
-static void _snap_destroy(const struct segment_type *segtype)
+static void _snap_destroy(struct segment_type *segtype)
 {
-       dm_free((void *)segtype);
+       dm_free(segtype);
 }
 
 static struct segtype_handler _snapshot_ops = {

diff --git a/lib/striped/striped.c b/lib/striped/striped.c
index 7ba963bf0a8a87861a8032b0be9ed53052170068..51bf24a1e320ee1787a181637d4cd61a4c08b399 100644 (file)
--- a/lib/striped/striped.c
+++ b/lib/striped/striped.c
@@ -199,9 +199,9 @@ static int _striped_target_present(struct cmd_context *cmd,
 }
 #endif
 
-static void _striped_destroy(const struct segment_type *segtype)
+static void _striped_destroy(struct segment_type *segtype)
 {
-       dm_free((void *)segtype);
+       dm_free(segtype);
 }
 
 static struct segtype_handler _striped_ops = {

diff --git a/lib/unknown/unknown.c b/lib/unknown/unknown.c
index 6dc00f66686c26bebdfc755e7a45983c781668d8..332ae99e09330656899e3998364e82c9f5a8432f 100644 (file)
--- a/lib/unknown/unknown.c
+++ b/lib/unknown/unknown.c
@@ -74,9 +74,9 @@ static int _unknown_add_target_line(struct dev_manager *dm __attribute__((unused
 }
 #endif
 
-static void _unknown_destroy(const struct segment_type *segtype)
+static void _unknown_destroy(struct segment_type *segtype)
 {
-       dm_free((void *)segtype);
+       dm_free(segtype);
 }
 
 static struct segtype_handler _unknown_ops = {

diff --git a/lib/zero/zero.c b/lib/zero/zero.c
index 7e5ffa6a378f36cd4c3262051f6ee6ebc57341fa..16ce66c40f504db8dd66a591b9385f772f9ca678 100644 (file)
--- a/lib/zero/zero.c
+++ b/lib/zero/zero.c
@@ -78,9 +78,9 @@ static int _zero_modules_needed(struct dm_pool *mem,
        return 1;
 }
 
-static void _zero_destroy(const struct segment_type *segtype)
+static void _zero_destroy(struct segment_type *segtype)
 {
-       dm_free((void *) segtype);
+       dm_free(segtype);
 }
 
 static struct segtype_handler _zero_ops = {