From 0b264ba292a0ae537c3eeacaddd15d6da2d6e22d Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Fri, 24 Apr 2009 09:55:21 +0000 Subject: [PATCH] logsys.c: avoid an unnecessary strlen call * exec/logsys.c (strcpy_cutoff): Use strlen, then memcpy, not strcpy, then strlen. git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@2143 fd59a12c-fef9-0310-b244-a6a79926bd2f --- exec/logsys.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/exec/logsys.c b/exec/logsys.c index a06a5a5a..3a78ebae 100644 --- a/exec/logsys.c +++ b/exec/logsys.c @@ -279,12 +279,12 @@ do { \ */ static inline int strcpy_cutoff (char *dest, const char *src, int cutoff) { - unsigned int len; - if (cutoff <= 0) { - strcpy (dest, src); - return (strlen (dest)); + size_t len = strlen (src); + memcpy (dest, src, len + 1); + return (len); } else { + size_t len; strncpy (dest, src, cutoff); dest[cutoff] = '\0'; len = strlen (dest);