summaryrefslogtreecommitdiff
path: root/innobase/include
diff options
context:
space:
mode:
authorunknown <osku@127.(none)>2005-09-29 13:39:27 +0300
committerunknown <osku@127.(none)>2005-09-29 13:39:27 +0300
commitbf7fe05f9c234cdf8fad69030eaa0b6529298dfd (patch)
treecd4ba72229fd3380d9c81d9744ad3bdeeb5a75ff /innobase/include
parent05bcc7ed0752bee46f7460e315af21c5b2500c4c (diff)
parentb2d8eb02a7ee3fd6204ddbb037321b76f36db24e (diff)
downloadmariadb-git-bf7fe05f9c234cdf8fad69030eaa0b6529298dfd.tar.gz
Merge 127.(none):/home/osku/mysql/5.0/clean
into 127.(none):/home/osku/mysql/5.0/revcpy
Diffstat (limited to 'innobase/include')
-rw-r--r--innobase/include/ut0mem.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/innobase/include/ut0mem.h b/innobase/include/ut0mem.h
index 8f109a64b55..b9bbe0b5c92 100644
--- a/innobase/include/ut0mem.h
+++ b/innobase/include/ut0mem.h
@@ -122,6 +122,7 @@ ut_strcmp(const void* str1, const void* str2);
Copies up to size - 1 characters from the NUL-terminated string src to
dst, NUL-terminating the result. Returns strlen(src), so truncation
occurred if the return value >= size. */
+
ulint
ut_strlcpy(
/*=======*/
@@ -131,6 +132,18 @@ ut_strlcpy(
ulint size); /* in: size of destination buffer */
/**************************************************************************
+Like ut_strlcpy, but if src doesn't fit in dst completely, copies the last
+(size - 1) bytes of src, not the first. */
+
+ulint
+ut_strlcpy_rev(
+/*===========*/
+ /* out: strlen(src) */
+ char* dst, /* in: destination buffer */
+ const char* src, /* in: source buffer */
+ ulint size); /* in: size of destination buffer */
+
+/**************************************************************************
Compute strlen(ut_strcpyq(str, q)). */
UNIV_INLINE
ulint