summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarel Zak2012-11-30 11:10:22 +0100
committerKarel Zak2012-11-30 11:10:22 +0100
commite45fccafdef8e0e540730f635f76892873812b4e (patch)
treeb4e2a0e8be9fb93cf88e3e527cba651aa42357c0
parentlibblkid: remove blkid_{strndup,strdup} (diff)
downloadkernel-qcow2-util-linux-e45fccafdef8e0e540730f635f76892873812b4e.tar.gz
kernel-qcow2-util-linux-e45fccafdef8e0e540730f635f76892873812b4e.tar.xz
kernel-qcow2-util-linux-e45fccafdef8e0e540730f635f76892873812b4e.zip
libblkid: cleanup blkid_strconcat
Signed-off-by: Karel Zak <kzak@redhat.com>
-rw-r--r--libblkid/src/blkidP.h3
-rw-r--r--libblkid/src/devno.c2
2 files changed, 1 insertions, 4 deletions
diff --git a/libblkid/src/blkidP.h b/libblkid/src/blkidP.h
index 774193cbc..b18528d47 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 08ec7afd6..e7b254cfa 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;