From 2921dbf2f8df2c15382ccaba419a647a9573e72c Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Fri, 12 Nov 2004 20:41:03 +0000 Subject: [PATCH] Speed up tor_strndup a lot: profiling suggests that our use of strlcpy here was a bad idea. svn:r2821 --- trunk/src/common/util.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/trunk/src/common/util.c b/trunk/src/common/util.c index 16cc290a8e..ced770e577 100644 --- a/trunk/src/common/util.c +++ b/trunk/src/common/util.c @@ -167,7 +167,12 @@ char *tor_strndup(const char *s, size_t n) { char *dup; tor_assert(s); dup = tor_malloc(n+1); - strlcpy(dup, s, n+1); + /* Performance note: Ordinarly we prefer strlcpy to strncpy. But + * this function gets called a whole lot, and platform strncpy is + * much faster than strlcpy when strlen(s) is much longer than n. + */ + strncpy(dup, s, n+1); + dup[n]='\0'; return dup; }