summaryrefslogtreecommitdiff
path: root/mysys
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 /mysys
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 'mysys')
-rw-r--r--mysys/mf_tempdir.c2
-rw-r--r--mysys/my_malloc.c2
-rw-r--r--mysys/safemalloc.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/mysys/mf_tempdir.c b/mysys/mf_tempdir.c
index 0a3d41efdc5..e79980ab931 100644
--- a/mysys/mf_tempdir.c
+++ b/mysys/mf_tempdir.c
@@ -53,7 +53,7 @@ my_bool init_tmpdir(MY_TMPDIR *tmpdir, const char *pathlist)
end=strcend(pathlist, DELIM);
strmake(buff, pathlist, (uint) (end-pathlist));
length= cleanup_dirname(buff, buff);
- if (!(copy= my_strdup_with_length(buff, length, MYF(MY_WME))) ||
+ if (!(copy= my_strndup(buff, length, MYF(MY_WME))) ||
insert_dynamic(&t_arr, (gptr) &copy))
DBUG_RETURN(TRUE);
pathlist=end+1;
diff --git a/mysys/my_malloc.c b/mysys/my_malloc.c
index 3f601a42dc9..3fb3866f79c 100644
--- a/mysys/my_malloc.c
+++ b/mysys/my_malloc.c
@@ -83,7 +83,7 @@ char *my_strdup(const char *from, myf my_flags)
}
-char *my_strdup_with_length(const byte *from, uint length, myf my_flags)
+char *my_strndup(const byte *from, uint length, myf my_flags)
{
gptr ptr;
if ((ptr=my_malloc(length+1,my_flags)) != 0)
diff --git a/mysys/safemalloc.c b/mysys/safemalloc.c
index 6cdf98c5f5f..e40fd751037 100644
--- a/mysys/safemalloc.c
+++ b/mysys/safemalloc.c
@@ -525,7 +525,7 @@ char *_my_strdup(const char *from, const char *filename, uint lineno,
} /* _my_strdup */
-char *_my_strdup_with_length(const byte *from, uint length,
+char *_my_strndup(const byte *from, uint length,
const char *filename, uint lineno,
myf MyFlags)
{