]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
libblkid: number of functions should not be declared extern [smatch scan]
authorSami Kerola <kerolasa@iki.fi>
Mon, 8 Apr 2013 19:32:52 +0000 (20:32 +0100)
committerKarel Zak <kzak@redhat.com>
Tue, 9 Apr 2013 10:26:43 +0000 (12:26 +0200)
These functions are already marked extern in header file.

libblkid/src/dev.c:70:19: warning: function 'blkid_dev_devname' with external linkage has definition
libblkid/src/dev.c:128:26: warning: function 'blkid_dev_iterate_begin' with external linkage has definition
libblkid/src/dev.c:148:12: warning: function 'blkid_dev_set_search' with external linkage has definition
libblkid/src/dev.c:175:12: warning: function 'blkid_dev_next' with external linkage has definition
libblkid/src/dev.c:196:13: warning: function 'blkid_dev_iterate_end' with external linkage has definition
libblkid/src/tag.c:84:12: warning: function 'blkid_dev_has_tag' with external linkage has definition
libblkid/src/tag.c:282:26: warning: function 'blkid_tag_iterate_begin' with external linkage has definition
libblkid/src/tag.c:303:12: warning: function 'blkid_tag_next' with external linkage has definition
libblkid/src/tag.c:322:13: warning: function 'blkid_tag_iterate_end' with external linkage has definition
libblkid/src/tag.c:336:18: warning: function 'blkid_find_dev_with_tag' with external linkage has definition

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
libblkid/src/dev.c
libblkid/src/tag.c

index 11d0a02ec536748daa64224a0752b659b98f8933..a4b2aea910d44fc9efb39a84c8ca604c10beac84 100644 (file)
@@ -67,7 +67,7 @@ void blkid_free_dev(blkid_dev dev)
 /*
  * Given a blkid device, return its name
  */
-extern const char *blkid_dev_devname(blkid_dev dev)
+const char *blkid_dev_devname(blkid_dev dev)
 {
        return dev ? dev->bid_name : NULL;
 }
@@ -124,7 +124,7 @@ struct blkid_struct_dev_iterate {
        struct list_head        *p;
 };
 
-extern blkid_dev_iterate blkid_dev_iterate_begin(blkid_cache cache)
+blkid_dev_iterate blkid_dev_iterate_begin(blkid_cache cache)
 {
        blkid_dev_iterate iter;
 
@@ -144,7 +144,7 @@ extern blkid_dev_iterate blkid_dev_iterate_begin(blkid_cache cache)
        return iter;
 }
 
-extern int blkid_dev_set_search(blkid_dev_iterate iter,
+int blkid_dev_set_search(blkid_dev_iterate iter,
                                 char *search_type, char *search_value)
 {
        char *new_type, *new_value;
@@ -171,7 +171,7 @@ extern int blkid_dev_set_search(blkid_dev_iterate iter,
 /*
  * Return 0 on success, -1 on error
  */
-extern int blkid_dev_next(blkid_dev_iterate iter,
+int blkid_dev_next(blkid_dev_iterate iter,
                          blkid_dev *ret_dev)
 {
        blkid_dev               dev;
@@ -192,7 +192,7 @@ extern int blkid_dev_next(blkid_dev_iterate iter,
        return -1;
 }
 
-extern void blkid_dev_iterate_end(blkid_dev_iterate iter)
+void blkid_dev_iterate_end(blkid_dev_iterate iter)
 {
        if (!iter || iter->magic != DEV_ITERATE_MAGIC)
                return;
index 55df90ede6c5945217caecec66137bcec244fa5c..9cfd61769cb2c46e1f763f07fc4565f29c0d0b00 100644 (file)
@@ -81,7 +81,7 @@ blkid_tag blkid_find_tag_dev(blkid_dev dev, const char *type)
        return NULL;
 }
 
-extern int blkid_dev_has_tag(blkid_dev dev, const char *type,
+int blkid_dev_has_tag(blkid_dev dev, const char *type,
                             const char *value)
 {
        blkid_tag               tag;
@@ -277,7 +277,7 @@ struct blkid_struct_tag_iterate {
        struct list_head        *p;
 };
 
-extern blkid_tag_iterate blkid_tag_iterate_begin(blkid_dev dev)
+blkid_tag_iterate blkid_tag_iterate_begin(blkid_dev dev)
 {
        blkid_tag_iterate       iter;
 
@@ -298,7 +298,7 @@ extern blkid_tag_iterate blkid_tag_iterate_begin(blkid_dev dev)
 /*
  * Return 0 on success, -1 on error
  */
-extern int blkid_tag_next(blkid_tag_iterate iter,
+int blkid_tag_next(blkid_tag_iterate iter,
                          const char **type, const char **value)
 {
        blkid_tag tag;
@@ -317,7 +317,7 @@ extern int blkid_tag_next(blkid_tag_iterate iter,
        return 0;
 }
 
-extern void blkid_tag_iterate_end(blkid_tag_iterate iter)
+void blkid_tag_iterate_end(blkid_tag_iterate iter)
 {
        if (!iter || iter->magic != TAG_ITERATE_MAGIC)
                return;
@@ -331,7 +331,7 @@ extern void blkid_tag_iterate_end(blkid_tag_iterate iter)
  * search specification, it returns the one with the highest priority
  * value.  This allows us to give preference to EVMS or LVM devices.
  */
-extern blkid_dev blkid_find_dev_with_tag(blkid_cache cache,
+blkid_dev blkid_find_dev_with_tag(blkid_cache cache,
                                         const char *type,
                                         const char *value)
 {