summaryrefslogtreecommitdiffstats
path: root/shlibs/mount/src
diff options
context:
space:
mode:
authorKarel Zak2010-08-20 13:03:51 +0200
committerKarel Zak2010-08-20 13:03:51 +0200
commitec25979447b09387c8152d570581d963df91261e (patch)
tree117fc2de54956397960834d8945b63e341db928b /shlibs/mount/src
parentrev: coding style, various fixes (diff)
downloadkernel-qcow2-util-linux-ec25979447b09387c8152d570581d963df91261e.tar.gz
kernel-qcow2-util-linux-ec25979447b09387c8152d570581d963df91261e.tar.xz
kernel-qcow2-util-linux-ec25979447b09387c8152d570581d963df91261e.zip
libmount: remove unused mnt_strconcat3()
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'shlibs/mount/src')
-rw-r--r--shlibs/mount/src/mountP.h2
-rw-r--r--shlibs/mount/src/utils.c27
2 files changed, 0 insertions, 29 deletions
diff --git a/shlibs/mount/src/mountP.h b/shlibs/mount/src/mountP.h
index ddd86ea28..6145b730f 100644
--- a/shlibs/mount/src/mountP.h
+++ b/shlibs/mount/src/mountP.h
@@ -70,8 +70,6 @@ extern char *strndup(const char *s, size_t n);
extern char *strnchr(const char *s, size_t maxlen, int c);
#endif
extern char *mnt_get_username(const uid_t uid);
-extern char *mnt_strconcat3(char *s, const char *t, const char *u);
-
/*
* Generic iterator
diff --git a/shlibs/mount/src/utils.c b/shlibs/mount/src/utils.c
index f487383a8..6133cdd77 100644
--- a/shlibs/mount/src/utils.c
+++ b/shlibs/mount/src/utils.c
@@ -265,33 +265,6 @@ int mnt_match_options(const char *optstr, const char *pattern)
}
/*
- * Reallocates its first arg @s - typical use: s = mnt_strconcat3(s,t,u);
- * Returns reallocated @s ion succes or NULL in case of error.
- */
-char *mnt_strconcat3(char *s, const char *t, const char *u)
-{
- size_t len = 0;
-
- len = (s ? strlen(s) : 0) + (t ? strlen(t) : 0) + (u ? strlen(u) : 0);
-
- if (!len)
- return NULL;
- if (!s) {
- s = malloc(len + 1);
- *s = '\0';
- } else
- s = realloc(s, len + 1);
-
- if (!s)
- return NULL;
- if (t)
- strcat(s, t);
- if (u)
- strcat(s, u);
- return s;
-}
-
-/*
* Returns allocated string with username or NULL.
*/
char *mnt_get_username(const uid_t uid)