summaryrefslogtreecommitdiff
path: root/innobase/ut
diff options
context:
space:
mode:
authorunknown <marko@hundin.mysql.fi>2004-05-14 14:23:46 +0300
committerunknown <marko@hundin.mysql.fi>2004-05-14 14:23:46 +0300
commitdc10bbda7d997226cf83eefa6d76cbf8d0d5f9d8 (patch)
treeb002f57f0288eee5bba70d3706d5429d6368d9ba /innobase/ut
parent39abf39463724cb37478ad13b1fa3bca37fa73fe (diff)
downloadmariadb-git-dc10bbda7d997226cf83eefa6d76cbf8d0d5f9d8.tar.gz
InnoDB: ut0mem: Remove ut_str_catenate(), add const qualifiers
innobase/include/ut0mem.h: Add const qualifiers and remove unused function ut_str_catenate() innobase/include/ut0mem.ic: Add const qualifiers innobase/ut/ut0mem.c: Remove unused function ut_str_catenate()
Diffstat (limited to 'innobase/ut')
-rw-r--r--innobase/ut/ut0mem.c26
1 files changed, 0 insertions, 26 deletions
diff --git a/innobase/ut/ut0mem.c b/innobase/ut/ut0mem.c
index f21bb752fac..47b612d757e 100644
--- a/innobase/ut/ut0mem.c
+++ b/innobase/ut/ut0mem.c
@@ -273,29 +273,3 @@ ut_memcpyq(
return(dest);
}
-
-/**************************************************************************
-Catenates two strings into newly allocated memory. The memory must be freed
-using mem_free. */
-
-char*
-ut_str_catenate(
-/*============*/
- /* out, own: catenated null-terminated string */
- char* str1, /* in: null-terminated string */
- char* str2) /* in: null-terminated string */
-{
- ulint len1;
- ulint len2;
- char* str;
-
- len1 = ut_strlen(str1);
- len2 = ut_strlen(str2);
-
- str = mem_alloc(len1 + len2 + 1);
-
- ut_memcpy(str, str1, len1);
- ut_memcpy(str + len1, str2, len2 + 1);
-
- return(str);
-}