Minor string-length refactoring.

* alloc.c (xstrdup): Use memcpy, not strcpy, since the length's known.
* frame.c (make_monitor_attribute_list):
Prefer build_string to strlen + make_string.

diff --git a/src/ChangeLog b/src/ChangeLog
index f1293be9855b203ef8dc90e57b5fe8fe29c829a4..976d068dadccf78ab8676b32aa277fbfa8e2c46a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2013-08-10  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Minor string-length refactoring.
+       * alloc.c (xstrdup): Use memcpy, not strcpy, since the length's known.
+       * frame.c (make_monitor_attribute_list):
+       Prefer build_string to strlen + make_string.
+
 2013-08-10  Jan Djärv  <jan.h.d@swipnet.se>
 
        * xterm.c (x_error_handler): Also ignore BadWindow for X_SetInputFocus,

diff --git a/src/alloc.c b/src/alloc.c
index 19418bd6686eeddaecb8821925c0be5f30e7c6bf..f9bcaed0117499f29d4ba36b1542588b150c20a8 100644 (file)
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -796,8 +796,10 @@ xpalloc (void *pa, ptrdiff_t *nitems, ptrdiff_t nitems_incr_min,
 char *
 xstrdup (const char *s)
 {
+  ptrdiff_t size;
   eassert (s);
-  return strcpy (xmalloc (strlen (s) + 1), s);
+  size = strlen (s) + 1;
+  return memcpy (xmalloc (size), s, size);
 }
 
 /* Like putenv, but (1) use the equivalent of xmalloc and (2) the

diff --git a/src/frame.c b/src/frame.c
index 853ec4413430f80773be8f4f1b3c97c4f7011bf2..9989ef7af132decec7b9aba5e355b4198a66a519 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -725,7 +725,7 @@ affects all frames on the same terminal device.  */)
   XSETFRAME (frame, f);
 
   store_in_alist (&parms, Qtty_type, build_string (t->display_info.tty->type));
-  store_in_alist (&parms, Qtty, 
+  store_in_alist (&parms, Qtty,
                  (t->display_info.tty->name
                   ? build_string (t->display_info.tty->name)
                   : Qnil));
@@ -4203,8 +4203,7 @@ make_monitor_attribute_list (struct MonitorInfo *monitors,
                         mi->work.width, mi->work.height);
       geometry = list4i (mi->geom.x, mi->geom.y,
                         mi->geom.width, mi->geom.height);
-      attributes = Fcons (Fcons (Qsource,
-                                 make_string (source, strlen (source))),
+      attributes = Fcons (Fcons (Qsource, build_string (source)),
                           attributes);
       attributes = Fcons (Fcons (Qframes, AREF (monitor_frames, i)),
                          attributes);