InnoDB: ut0mem: Remove ut_str_catenate(), add const qualifiers

innobase/include/ut0mem.h

@@ -18,15 +18,15 @@ extern ulint	ut_total_allocated_memory;
 
 UNIV_INLINE
 void*
-ut_memcpy(void* dest, void* sour, ulint n);
+ut_memcpy(void* dest, const void* sour, ulint n);
 
 UNIV_INLINE
 void*
-ut_memmove(void* dest, void* sour, ulint n);
+ut_memmove(void* dest, const void* sour, ulint n);
 
 UNIV_INLINE
 int
-ut_memcmp(void* str1, void* str2, ulint n);
+ut_memcmp(const void* str1, const void* str2, ulint n);
 
 
 /**************************************************************************
@@ -75,7 +75,7 @@ ut_free_all_mem(void);
 
 UNIV_INLINE
 char*
-ut_strcpy(char* dest, char* sour);
+ut_strcpy(char* dest, const char* sour);
 
 UNIV_INLINE
 ulint
@@ -83,7 +83,7 @@ ut_strlen(const char* str);
 
 UNIV_INLINE
 int
-ut_strcmp(void* str1, void* str2);
+ut_strcmp(const void* str1, const void* str2);
 
 /**************************************************************************
 Determine the length of a string when it is quoted with ut_strcpyq(). */
@@ -118,17 +118,6 @@ ut_memcpyq(
 	const char*	src,	/* in: string to be quoted */
 	ulint		len);	/* in: length of src */
 
-/**************************************************************************
-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 */
-
 #ifndef UNIV_NONINL
 #include "ut0mem.ic"
 #endif

innobase/include/ut0mem.ic

@@ -8,28 +8,28 @@ Created 5/30/1994 Heikki Tuuri
 
 UNIV_INLINE
 void*
-ut_memcpy(void* dest, void* sour, ulint n)
+ut_memcpy(void* dest, const void* sour, ulint n)
 {
 	return(memcpy(dest, sour, n)); 
 }
 
 UNIV_INLINE
 void*
-ut_memmove(void* dest, void* sour, ulint n)
+ut_memmove(void* dest, const void* sour, ulint n)
 {
 	return(memmove(dest, sour, n));
 }
 
 UNIV_INLINE
 int
-ut_memcmp(void* str1, void* str2, ulint n)
+ut_memcmp(const void* str1, const void* str2, ulint n)
 {
 	return(memcmp(str1, str2, n));
 }
 
 UNIV_INLINE
 char*
-ut_strcpy(char* dest, char* sour)
+ut_strcpy(char* dest, const char* sour)
 {
 	return(strcpy(dest, sour));
 }
@@ -43,9 +43,9 @@ ut_strlen(const char* str)
 
 UNIV_INLINE
 int
-ut_strcmp(void* str1, void* str2)
+ut_strcmp(const void* str1, const void* str2)
 {
-	return(strcmp((char*)str1, (char*)str2));
+	return(strcmp((const char*)str1, (const char*)str2));
 }
 
 /**************************************************************************

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);
-}