libfdisk: make labels allocations readable for analysers [coverity scan]

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/libfdisk/src/bsd.c b/libfdisk/src/bsd.c
index a7e2791a7ca0985f5e59cadb9cd409c5941a421c..313ae5ae0fe4732fac13330fb591732f53d9b8c9 100644 (file)
--- a/libfdisk/src/bsd.c
+++ b/libfdisk/src/bsd.c
@@ -1060,5 +1060,6 @@ struct fdisk_label *fdisk_new_bsd_label(struct fdisk_context *cxt __attribute__
        lb->flags |= FDISK_LABEL_FL_INCHARS_PARTNO;
        lb->flags |= FDISK_LABEL_FL_REQUIRE_GEOMETRY;
 
-       return lb;
+       /* return calloc() result to keep static anaylizers happy */
+       return (struct fdisk_label *) bsd;
 }

diff --git a/libfdisk/src/dos.c b/libfdisk/src/dos.c
index 463886e172f09297474aa1f7952c2c458bd86070..543856f182e76e9f86d36ae43f93723a7e971275 100644 (file)
--- a/libfdisk/src/dos.c
+++ b/libfdisk/src/dos.c
@@ -2680,7 +2680,8 @@ struct fdisk_label *fdisk_new_dos_label(struct fdisk_context *cxt __attribute__
        lb->geom_max.heads = 255;
        lb->geom_max.cylinders = 1048576;
 
-       return lb;
+       /* return calloc() result to keep static anaylizers happy */
+       return (struct fdisk_label *) dos;
 }
 
 /**

diff --git a/libfdisk/src/gpt.c b/libfdisk/src/gpt.c
index 6a01b1d61887c163557bb87a01154b585d860c8c..6b07d9841eebad68932f0845daff3d476ae3d9ba 100644 (file)
--- a/libfdisk/src/gpt.c
+++ b/libfdisk/src/gpt.c
@@ -3213,7 +3213,8 @@ struct fdisk_label *fdisk_new_gpt_label(struct fdisk_context *cxt __attribute__
        lb->fields = gpt_fields;
        lb->nfields = ARRAY_SIZE(gpt_fields);
 
-       return lb;
+       /* return calloc() result to keep static anaylizers happy */
+       return (struct fdisk_label *) gpt;
 }
 
 /**

diff --git a/libfdisk/src/sgi.c b/libfdisk/src/sgi.c
index 6b4b5d116fe93beb0d39cf0db099a410d868de18..64adf345433c8990af139dc8f139dedef6f3bbc0 100644 (file)
--- a/libfdisk/src/sgi.c
+++ b/libfdisk/src/sgi.c
@@ -1204,5 +1204,6 @@ struct fdisk_label *fdisk_new_sgi_label(struct fdisk_context *cxt __attribute__
 
        lb->flags |= FDISK_LABEL_FL_REQUIRE_GEOMETRY;
 
-       return lb;
+       /* return calloc() result to keep static anaylizers happy */
+       return (struct fdisk_label *) sgi;
 }

diff --git a/libfdisk/src/sun.c b/libfdisk/src/sun.c
index 833f421a839501e1179ab7e7ed30ee37f8e6cd40..4c3b1d8cb62f1edcfe666fb80558feb8fb8c4195 100644 (file)
--- a/libfdisk/src/sun.c
+++ b/libfdisk/src/sun.c
@@ -1186,5 +1186,7 @@ struct fdisk_label *fdisk_new_sun_label(struct fdisk_context *cxt __attribute__
        lb->geom_max.sectors = 1024;
        lb->geom_max.heads = 1024;
        lb->geom_max.cylinders = USHRT_MAX;
-       return lb;
+
+       /* return calloc() result to keep static anaylizers happy */
+       return (struct fdisk_label *) sun;
 }