diff options
| author | marko@hundin.mysql.fi <> | 2004-05-14 14:23:46 +0300 |
|---|---|---|
| committer | marko@hundin.mysql.fi <> | 2004-05-14 14:23:46 +0300 |
| commit | 3c87eda7eeebe4f272fd6e7d03873e261c023761 (patch) | |
| tree | b002f57f0288eee5bba70d3706d5429d6368d9ba /innobase/include/ut0mem.h | |
| parent | 3a9e590166b25c7100424ccc48dd2c164d8824fa (diff) | |
| download | mariadb-git-3c87eda7eeebe4f272fd6e7d03873e261c023761.tar.gz | |
InnoDB: ut0mem: Remove ut_str_catenate(), add const qualifiers
Diffstat (limited to 'innobase/include/ut0mem.h')
| -rw-r--r-- | innobase/include/ut0mem.h | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/innobase/include/ut0mem.h b/innobase/include/ut0mem.h index bfc937eb212..85b99efff68 100644 --- a/innobase/include/ut0mem.h +++ b/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 |