X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxmalloc.c;h=ecce5296903651062f662098c87dbc29cb0c7f2c;hb=969fe755730d23ba7ff21ae7511f66067d0a94d8;hp=b1f6993e3d603b2905bc4aed3198e8f817ad4563;hpb=34ebad3df7a99eea326f9170f2517b5d23873d1b;p=gnulib.git diff --git a/lib/xmalloc.c b/lib/xmalloc.c index b1f6993e3..ecce52969 100644 --- a/lib/xmalloc.c +++ b/lib/xmalloc.c @@ -1,8 +1,8 @@ /* xmalloc.c -- malloc with out of memory checking - Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2008 Free Software Foundation, - Inc. + Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, + 2000, 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010 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 @@ -28,10 +28,6 @@ #include #include -#ifndef SIZE_MAX -# define SIZE_MAX ((size_t) -1) -#endif - /* 1 if calloc is known to be compatible with GNU calloc. This matters if we are not also using the calloc module, which defines HAVE_CALLOC and supports the GNU API even on non-GNU platforms. */ @@ -113,24 +109,6 @@ xmemdup (void const *p, size_t s) return memcpy (xmalloc (s), p, s); } -/* Clone an object P of size S, with error checking, and include a - terminating NUL byte. - - The terminating NUL makes it safe to use strlen or rawmemchr to - check for embedded NUL; it also speeds up algorithms such as escape - sequence processing on arbitrary memory, by making it always safe - to read the byte after the escape character rather than having to - check if each escape character is the last byte in the object. */ - -void * -xmemdup0 (void const *p, size_t s) -{ - char *result = xcharalloc (s + 1); - memcpy (result, p, s); - result[s] = 0; - return result; -} - /* Clone STRING. */ char *