summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <brian@zim.tangent.org>2006-01-25 19:54:42 -0800
committerunknown <brian@zim.tangent.org>2006-01-25 19:54:42 -0800
commit456524c0608c0fdbf61c585b2bd5dea57e861ef2 (patch)
tree3da670fea2b41862a7aafcd0b78759610f62319b /include
parent58de75fae8bcfebea7549fa3eb909ca6fe8cb090 (diff)
downloadmariadb-git-456524c0608c0fdbf61c585b2bd5dea57e861ef2.tar.gz
Rename of my_strdup_with_lenght to match the more common "strndup" method. Soo its now my_strndup().
my_stat() gettinng the correct parameter list may be next :) client/mysqlslap.c: rename extra/comp_err.c: rename include/my_sys.h: replace mysys/mf_tempdir.c: replace mysys/my_malloc.c: replace mysys/safemalloc.c: replace sql/ha_federated.cc: replace sql/log_event.cc: replace sql/set_var.cc: replace sql/set_var.h: replace storage/myisam/ft_stopwords.c: replace
Diffstat (limited to 'include')
-rw-r--r--include/my_sys.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/my_sys.h b/include/my_sys.h
index 89b0bd4fbec..00c42fc5935 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -136,7 +136,7 @@ extern int NEAR my_errno; /* Last error in mysys */
#define my_free(PTR,FLAG) _myfree((PTR), __FILE__, __LINE__,FLAG)
#define my_memdup(A,B,C) _my_memdup((A),(B), __FILE__,__LINE__,C)
#define my_strdup(A,C) _my_strdup((A), __FILE__,__LINE__,C)
-#define my_strdup_with_length(A,B,C) _my_strdup_with_length((A),(B),__FILE__,__LINE__,C)
+#define my_strndup(A,B,C) _my_strndup((A),(B),__FILE__,__LINE__,C)
#define TRASH(A,B) bfill(A, B, 0x8F)
#define QUICK_SAFEMALLOC sf_malloc_quick=1
#define NORMAL_SAFEMALLOC sf_malloc_quick=0
@@ -158,7 +158,7 @@ extern gptr my_realloc(gptr oldpoint,uint Size,myf MyFlags);
extern void my_no_flags_free(gptr ptr);
extern gptr my_memdup(const byte *from,uint length,myf MyFlags);
extern char *my_strdup(const char *from,myf MyFlags);
-extern char *my_strdup_with_length(const byte *from, uint length,
+extern char *my_strndup(const byte *from, uint length,
myf MyFlags);
/* we do use FG (as a no-op) in below so that a typo on FG is caught */
#define my_free(PTR,FG) ((void)FG,my_no_flags_free(PTR))
@@ -597,7 +597,7 @@ extern gptr _my_memdup(const byte *from,uint length,
const char *sFile, uint uLine,myf MyFlag);
extern my_string _my_strdup(const char *from, const char *sFile, uint uLine,
myf MyFlag);
-extern char *_my_strdup_with_length(const byte *from, uint length,
+extern char *_my_strndup(const byte *from, uint length,
const char *sFile, uint uLine,
myf MyFlag);