From: Karel Zak <kzak@redhat.com>
Date: Fri, 30 Nov 2012 10:10:22 +0000 (+0100)
Subject: libblkid: cleanup blkid_strconcat
X-Git-Tag: v2.23-rc1~473
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e45fccafdef8e0e540730f635f76892873812b4e;p=thirdparty%2Futil-linux.git

libblkid: cleanup blkid_strconcat

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

diff --git a/libblkid/src/blkidP.h b/libblkid/src/blkidP.h
index 774193cbc8..b18528d47f 100644
--- a/libblkid/src/blkidP.h
+++ b/libblkid/src/blkidP.h
@@ -286,9 +286,6 @@ struct blkid_struct_cache
 #define BLKID_BIC_FL_PROBED	0x0002	/* We probed /proc/partition devices */
 #define BLKID_BIC_FL_CHANGED	0x0004	/* Cache has changed from disk */
 
-extern char *blkid_strconcat(const char *a, const char *b, const char *c)
-			__attribute__((warn_unused_result));
-
 /* config file */
 #define BLKID_CONFIG_FILE	"/etc/blkid.conf"
 
diff --git a/libblkid/src/devno.c b/libblkid/src/devno.c
index 08ec7afd6b..e7b254cfad 100644
--- a/libblkid/src/devno.c
+++ b/libblkid/src/devno.c
@@ -37,7 +37,7 @@
 #include "at.h"
 #include "sysfs.h"
 
-char *blkid_strconcat(const char *a, const char *b, const char *c)
+static char *blkid_strconcat(const char *a, const char *b, const char *c)
 {
 	char *res, *p;
 	size_t len, al, bl, cl;