Rename xclone to xmemdup. Remove obsolete xalloc macros.

Remove xstrdup.c and move xstrdup implementation to xmalloc.c.

diff --git a/ChangeLog b/ChangeLog
index a97f3b4657df002781d3064d644474642434ead9..e05a3ad41caa3b7ba2073f3e9a88fa4e4435ac47 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-10-04  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * modules/xalloc (Files, Makefile.am): Remove xstrdup.c.
+
        * modules/argmatch, modules/argp, modules/closeout, modules/error,
        modules/exclude, modules/getdate, modules/getline,
        modules/getndelim2, modules/getpass, modules/getpass-gnu,

diff --git a/lib/ChangeLog b/lib/ChangeLog
index a1b601c279ee040f9d58e01fb081c26b3fb226ad..026ca95534a823c7941c31d8c18d79fec7dd4c60 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,5 +1,12 @@
 2004-10-04  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * xalloc.h (xmemdup): Renamed from xclone.
+       * xmalloc.c (xmemdup): Likewise.
+       * xalloc.h (CCLONE, CLONE, NEW, XCALLOC, XMALLOC, XREALLOC,
+       XFREE): Remove these long-obsolescent macros.
+       * xmalloc.c (xstrdup): Implementation moved here from xstrdup.c
+       * xstrdup.c: Remove.
+
        * regex.c (re_comp): Cast gettext return value to char *,
        Problem reported by Martin Neitzel via Mark D. Baushke.
        

diff --git a/lib/xalloc.h b/lib/xalloc.h
index d81f2a67648844cfcc5cd616d81ac695ccd82015..8d0fcf0faeeda22f0868df13c78c478f159ef285 100644 (file)
--- a/lib/xalloc.h
+++ b/lib/xalloc.h
@@ -53,8 +53,8 @@ void *xrealloc (void *p, size_t s);
 void *xnrealloc (void *p, size_t n, size_t s);
 void *x2realloc (void *p, size_t *pn);
 void *x2nrealloc (void *p, size_t *pn, size_t s);
-void *xclone (void const *p, size_t s);
-char *xstrdup (const char *str);
+void *xmemdup (void const *p, size_t s);
+char *xstrdup (char const *str);
 
 /* Return 1 if an array of N objects, each of size S, cannot exist due
    to size arithmetic overflow.  S must be positive and N must be
@@ -71,17 +71,6 @@ char *xstrdup (const char *str);
 # define xalloc_oversized(n, s) \
     ((size_t) (sizeof (ptrdiff_t) <= sizeof (size_t) ? -1 : -2) / (s) < (n))
 
-/* These macros are deprecated; they will go away soon, and are retained
-   temporarily only to ease conversion to the functions described above.  */
-# define CCLONE(p, n) xclone (p, (n) * sizeof *(p))
-# define CLONE(p) xclone (p, sizeof *(p))
-# define NEW(type, var) type *var = xmalloc (sizeof (type))
-# define XCALLOC(type, n) xcalloc (n, sizeof (type))
-# define XMALLOC(type, n) xnmalloc (n, sizeof (type))
-# define XREALLOC(p, type, n) xnrealloc (p, n, sizeof (type))
-# define XFREE(p) free (p)
-
-
 # ifdef __cplusplus
 }
 # endif

diff --git a/lib/xmalloc.c b/lib/xmalloc.c
index 9b7a948c2f18bc342294088ecbe2d2ab94f84ca6..13c2490267d458d661200f2f464601c0f47f7d28 100644 (file)
--- a/lib/xmalloc.c
+++ b/lib/xmalloc.c
@@ -211,11 +211,19 @@ xcalloc (size_t n, size_t s)
 }
 
 /* Clone an object P of size S, with error checking.  There's no need
-   for xnclone (P, N, S), since xclone (P, N * S) works without any
+   for xnmemdup (P, N, S), since xmemdup (P, N * S) works without any
    need for an arithmetic overflow check.  */
 
 void *
-xclone (void const *p, size_t s)
+xmemdup (void const *p, size_t s)
 {
   return memcpy (xmalloc (s), p, s);
 }
+
+/* Clone STRING.  */
+
+char *
+xstrdup (char const *string)
+{
+  return xmemdup (string, strlen (string) + 1);
+}

diff --git a/lib/xstrdup.c b/lib/xstrdup.c
deleted file mode 100644 (file)
index 58f18be..0000000
--- a/lib/xstrdup.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* xstrdup.c -- copy a string with out of memory checking
-   Copyright (C) 1990, 1996, 1998, 2001, 2003 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-/* Specification.  */
-#include "xalloc.h"
-
-#include <string.h>
-
-/* Return a newly allocated copy of STRING.  */
-
-char *
-xstrdup (const char *string)
-{
-  return xclone (string, strlen (string) + 1);
-}

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 447fbfef62d1af18d16481d8cc055ff94ff7fe88..cf0eaa1c4c12e3ba538963e06c7d28728b1cf6bf 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,5 +1,7 @@
 2004-10-04  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * xalloc.m4 (gl_PREREQ_XSTRDUP): Remove.  All uses removed.
+
        * unlocked-io.m4: Add copyright notice.
        (gl_FUNC_GLIBC_UNLOCKED_IO): Define USE_UNLOCKED_IO.
 

diff --git a/m4/xalloc.m4 b/m4/xalloc.m4
index 4d9383509fe9676de348882ece27fb3baee38d0c..96797e9f5e65147b0ae96c09c1310da2de36e147 100644 (file)
--- a/m4/xalloc.m4
+++ b/m4/xalloc.m4
@@ -1,4 +1,4 @@
-# xalloc.m4 serial 9
+# xalloc.m4 serial 10
 dnl Copyright (C) 2002-2004 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -10,7 +10,6 @@ AC_DEFUN([gl_XALLOC],
 [
   gl_PREREQ_XALLOC
   gl_PREREQ_XMALLOC
-  gl_PREREQ_XSTRDUP
 ])
 
 # Prerequisites of lib/xalloc.h.
@@ -23,8 +22,3 @@ AC_DEFUN([gl_PREREQ_XMALLOC], [
   AC_REQUIRE([AC_C_INLINE])
   :
 ])
-
-# Prerequisites of lib/xstrdup.c.
-AC_DEFUN([gl_PREREQ_XSTRDUP], [
-  :
-])

diff --git a/modules/xalloc b/modules/xalloc
index ddc14485fbeccdd237acc1eaa564eadd75af184d..f07705171d16d813941fbc58e1b96310c12ef7f7 100644 (file)
--- a/modules/xalloc
+++ b/modules/xalloc
@@ -4,7 +4,6 @@ Memory allocation with out-of-memory checking.  Also see xalloc-die.
 Files:
 lib/xalloc.h
 lib/xmalloc.c
-lib/xstrdup.c
 m4/xalloc.m4
 
 Depends-on:
@@ -13,7 +12,7 @@ configure.ac:
 gl_XALLOC
 
 Makefile.am:
-lib_SOURCES += xalloc.h xmalloc.c xstrdup.c
+lib_SOURCES += xalloc.h xmalloc.c
 
 Include:
 "xalloc.h"