3 files changed, 9 insertions, 7 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 44d7260dead..2010444743a 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * ebrowse.c (xstrdup):
+        * etags.c (savenstr): Prefer tail calls.
+        * etags.c (concat): Omit unnecessary assignment.
+
 2013-10-24  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in ($(DESTDIR)${archlibdir}):
diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index 216865c3800..971f74e7fee 100644
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -514,7 +514,7 @@ static char *
 xstrdup (char *s)
 {
   if (s)
-    s = strcpy (xmalloc (strlen (s) + 1), s);
+    return strcpy (xmalloc (strlen (s) + 1), s);
   return s;
 }
 
diff --git a/lib-src/etags.c b/lib-src/etags.c
index aa8c773e357..21cf3654b9e 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -6243,12 +6243,9 @@ savestr (const char *cp)
 static char *
 savenstr (const char *cp, int len)
 {
-  register char *dp;
-
-  dp = xnew (len + 1, char);
-  memcpy (dp, cp, len);
+  char *dp = xnew (len + 1, char);
   dp[len] = '\0';
-  return dp;
+  return memcpy (dp, cp, len);
 }
 
 /*
@@ -6362,7 +6359,6 @@ concat (const char *s1, const char *s2, const char *s3)
   strcpy (result, s1);
   strcpy (result + len1, s2);
   strcpy (result + len1 + len2, s3);
-  result[len1 + len2 + len3] = '\0';
 
   return result;
 }