[Emacs-diffs] trunk r115094: Prefer tail calls.

[Paul Eggert]

------------------------------------------------------------
revno: 115094
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Wed 2013-11-13 17:52:18 -0800
message:
  Prefer tail calls.
  
  * lib-src/ebrowse.c (xstrdup):
  * lib-src/etags.c (savenstr):
  * lwlib/lwlib.c (safe_strdup):
  * src/xfns.c (xic_create_fontsetname):
  * src/xrdb.c (gethomedir): Prefer tail calls.
  * lib-src/etags.c (concat): Omit unnecessary assignment.
modified:
  lib-src/ChangeLog              changelog-20091113204419-o5vbwnq5f7feedwu-1608
  lib-src/ebrowse.c              ebrowse.c-20091113204419-o5vbwnq5f7feedwu-1798
  lib-src/etags.c                etags.c-20091113204419-o5vbwnq5f7feedwu-216
  lwlib/ChangeLog                changelog-20091113204419-o5vbwnq5f7feedwu-1447
  lwlib/lwlib.c                  lwlib.c-20091113204419-o5vbwnq5f7feedwu-672
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xfns.c                     xfns.c-20091113204419-o5vbwnq5f7feedwu-274
  src/xrdb.c                     xrdb.c-20091113204419-o5vbwnq5f7feedwu-177

=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2013-10-24 23:04:33 +0000
+++ b/lib-src/ChangeLog 2013-11-14 01:52:18 +0000
@@ -1,3 +1,9 @@
+2013-11-14  Paul Eggert  <address@hidden>
+
+       * ebrowse.c (xstrdup):
+       * etags.c (savenstr): Prefer tail calls.
+       * etags.c (concat): Omit unnecessary assignment.
+
 2013-10-24  Glenn Morris  <address@hidden>
 
        * Makefile.in ($(DESTDIR)${archlibdir}):

=== modified file 'lib-src/ebrowse.c'
--- a/lib-src/ebrowse.c 2013-07-10 23:23:57 +0000
+++ b/lib-src/ebrowse.c 2013-11-14 01:52:18 +0000
@@ -514,7 +514,7 @@
 xstrdup (char *s)
 {
   if (s)
-    s = strcpy (xmalloc (strlen (s) + 1), s);
+    return strcpy (xmalloc (strlen (s) + 1), s);
   return s;
 }
 

=== modified file 'lib-src/etags.c'
--- a/lib-src/etags.c   2013-07-02 00:33:04 +0000
+++ b/lib-src/etags.c   2013-11-14 01:52:18 +0000
@@ -6243,12 +6243,9 @@
 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 @@
   strcpy (result, s1);
   strcpy (result + len1, s2);
   strcpy (result + len1 + len2, s3);
-  result[len1 + len2 + len3] = '\0';
 
   return result;
 }

=== modified file 'lwlib/ChangeLog'
--- a/lwlib/ChangeLog   2013-11-02 19:41:33 +0000
+++ b/lwlib/ChangeLog   2013-11-14 01:52:18 +0000
@@ -1,3 +1,7 @@
+2013-11-14  Paul Eggert  <address@hidden>
+
+       * lwlib.c (safe_strdup): Prefer tail calls.
+
 2013-11-02  Glenn Morris  <address@hidden>
 
        Use relative filenames in TAGS files.

=== modified file 'lwlib/lwlib.c'
--- a/lwlib/lwlib.c     2013-01-01 09:11:05 +0000
+++ b/lwlib/lwlib.c     2013-11-14 01:52:18 +0000
@@ -103,11 +103,7 @@
 char *
 safe_strdup (const char *s)
 {
-  char *result;
-  if (! s) return 0;
-  result = (char *) xmalloc (strlen (s) + 1);
-  strcpy (result, s);
-  return result;
+  return s ? xstrdup (s) : 0;
 }
 
 static void

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-11-12 06:07:37 +0000
+++ b/src/ChangeLog     2013-11-14 01:52:18 +0000
@@ -1,3 +1,8 @@
+2013-11-14  Paul Eggert  <address@hidden>
+
+       * xfns.c (xic_create_fontsetname):
+       * xrdb.c (gethomedir): Prefer tail calls.
+
 2013-11-12  Paul Eggert  <address@hidden>
 
        * xterm.c (syms_of_xterm): staticpro Qmodifier_value, Qalt, Qhyper,

=== modified file 'src/xfns.c'
--- a/src/xfns.c        2013-11-06 18:41:31 +0000
+++ b/src/xfns.c        2013-11-14 01:52:18 +0000
@@ -1750,7 +1750,7 @@
        }
     }
   if (motif)
-    strcat (fontsetname, ":");
+    return strcat (fontsetname, ":");
   return fontsetname;
 }
 #endif /* HAVE_X_WINDOWS && USE_X_TOOLKIT */

=== modified file 'src/xrdb.c'
--- a/src/xrdb.c        2013-09-17 12:27:21 +0000
+++ b/src/xrdb.c        2013-11-14 01:52:18 +0000
@@ -234,9 +234,7 @@
 
   copy = xmalloc (strlen (ptr) + 2);
   strcpy (copy, ptr);
-  strcat (copy, "/");
-
-  return copy;
+  return strcat (copy, "/");
 }