diff options
Diffstat (limited to 'storage/innobase/include/ut0mem.ic')
| -rw-r--r-- | storage/innobase/include/ut0mem.ic | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/storage/innobase/include/ut0mem.ic b/storage/innobase/include/ut0mem.ic index 5c9071d52cc..224ff98b0f4 100644 --- a/storage/innobase/include/ut0mem.ic +++ b/storage/innobase/include/ut0mem.ic @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1994, 2011, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1994, 2014, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -28,35 +28,35 @@ Created 5/30/1994 Heikki Tuuri /** Wrapper for memcpy(3). Copy memory area when the source and target are not overlapping. -* @param dest in: copy to -* @param sour in: copy from -* @param n in: number of bytes to copy -* @return dest */ +@param[in,out] dest copy to +@param[in] src copy from +@param[in] n number of bytes to copy +@return dest */ UNIV_INLINE void* -ut_memcpy(void* dest, const void* sour, ulint n) +ut_memcpy(void* dest, const void* src, ulint n) { - return(memcpy(dest, sour, n)); + return(memcpy(dest, src, n)); } /** Wrapper for memmove(3). Copy memory area when the source and target are overlapping. -* @param dest in: copy to -* @param sour in: copy from -* @param n in: number of bytes to copy -* @return dest */ +@param[in,out] dest Move to +@param[in] src Move from +@param[in] n number of bytes to move +@return dest */ UNIV_INLINE void* -ut_memmove(void* dest, const void* sour, ulint n) +ut_memmove(void* dest, const void* src, ulint n) { - return(memmove(dest, sour, n)); + return(memmove(dest, src, n)); } /** Wrapper for memcmp(3). Compare memory areas. -* @param str1 in: first memory block to compare -* @param str2 in: second memory block to compare -* @param n in: number of bytes to compare -* @return negative, 0, or positive if str1 is smaller, equal, +@param[in] str1 first memory block to compare +@param[in] str2 second memory block to compare +@param[in] n number of bytes to compare +@return negative, 0, or positive if str1 is smaller, equal, or greater than str2, respectively. */ UNIV_INLINE int @@ -66,19 +66,19 @@ ut_memcmp(const void* str1, const void* str2, ulint n) } /** Wrapper for strcpy(3). Copy a NUL-terminated string. -* @param dest in: copy to -* @param sour in: copy from -* @return dest */ +@param[in,out] dest Destination to copy to +@param[in] src Source to copy from +@return dest */ UNIV_INLINE char* -ut_strcpy(char* dest, const char* sour) +ut_strcpy(char* dest, const char* src) { - return(strcpy(dest, sour)); + return(strcpy(dest, src)); } /** Wrapper for strlen(3). Determine the length of a NUL-terminated string. -* @param str in: string -* @return length of the string in bytes, excluding the terminating NUL */ +@param[in] str string +@return length of the string in bytes, excluding the terminating NUL */ UNIV_INLINE ulint ut_strlen(const char* str) @@ -87,9 +87,9 @@ ut_strlen(const char* str) } /** Wrapper for strcmp(3). Compare NUL-terminated strings. -* @param str1 in: first string to compare -* @param str2 in: second string to compare -* @return negative, 0, or positive if str1 is smaller, equal, +@param[in] str1 first string to compare +@param[in] str2 second string to compare +@return negative, 0, or positive if str1 is smaller, equal, or greater than str2, respectively. */ UNIV_INLINE int @@ -103,7 +103,7 @@ Converts a raw binary data to a NUL-terminated hex string. The output is truncated if there is not enough space in "hex", make sure "hex_size" is at least (2 * raw_size + 1) if you do not want this to happen. Returns the actual number of characters written to "hex" (including the NUL). -@return number of chars written */ +@return number of chars written */ UNIV_INLINE ulint ut_raw_to_hex( @@ -223,7 +223,7 @@ Adds single quotes to the start and end of string and escapes any quotes by doubling them. Returns the number of bytes that were written to "buf" (including the terminating NUL). If buf_size is too small then the trailing bytes from "str" are discarded. -@return number of bytes that were written */ +@return number of bytes that were written */ UNIV_INLINE ulint ut_str_sql_format( |