Mercurial > hg > octave-lojdl > gnulib-hg
view lib/eealloc.h @ 17102:9e72d3927af1
binary-io, eealloc, mbfile, mbiter, mbutil, xsize: better 'inline'
* lib/binary-io.c, lib/eealloc.c, lib/mbfile.c, lib/mbiter.c:
* lib/mbuiter.c, lib/xsize.c: New files.
* lib/binary-io.h (BINARY_IO_INLINE):
* lib/eealloc.h (EEALLOC_INLINE):
* lib/mbfile.h (MBFILE_INLINE):
* lib/mbiter.h (MBITER_INLINE):
* lib/mbuiter.h (MBUITER_INLINE):
* lib/xsize.h (XSIZE_INLINE):
New macros.
Replace all uses of 'static inline' with them.
Use _GL_INLINE_HEADER_BEGIN, _GL_INLINE_HEADER_END.
* m4/eealloc.m4 (gl_EEALLOC):
* m4/mbfile.m4 (gl_MBFILE):
* m4/mbiter.m4 (gl_MBITER):
* m4/xsize.m4 (gl_XSIZE):
Do not require AC_C_INLINE.
* modules/binary-io (Files, lib_SOURCES): Add lib/binary-io.c
* modules/eealloc (Files, lib_SOURCES): Add lib/eealloc.c.
* modules/mbfile (Files, lib_SOURCES): Add lib/mbfile.c.
* modules/mbiter (Files, lib_SOURCES): Add lib/mbiter.c.
* modules/mbuiter (Files, lib_SOURCES): Add lib/mbuiter.c.
* modules/xsize (Files, lib_SOURCES): Add lib/xsize.c.
* modules/binary-io, modules/eealloc, modules/mbfile:
* modules/mbiter, modules/mbuiter:
(Depends-on): Add extern-inline.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Wed, 29 Aug 2012 23:13:42 -0700 |
parents | 8250f2777afc |
children | e542fd46ad6f |
line wrap: on
line source
/* Memory allocation with expensive empty allocations. Copyright (C) 2003, 2008, 2010-2012 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2003, based on prior work by Jim Meyering. 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 3 of the License, 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, see <http://www.gnu.org/licenses/>. */ #ifndef _EEALLOC_H #define _EEALLOC_H /* malloc() and realloc() are allowed to return NULL when asked to allocate a memory block of 0 bytes; this is not an out-of-memory condition. (See ISO C 99 section 7.20.3.) In some places, this is not welcome, because it requires extra checking (so as not to confuse a zero-sized allocation with an out-of-memory condition). This file provides malloc()/realloc() workalikes which return non-NULL pointers for succeeding zero-sized allocations. GNU libc already defines malloc() and realloc() this way; on such platforms the workalikes are aliased to the original malloc()/realloc() functions. */ #include <stdlib.h> _GL_INLINE_HEADER_BEGIN #ifndef EEALLOC_INLINE # define EEALLOC_INLINE _GL_INLINE #endif #if MALLOC_0_IS_NONNULL # define eemalloc malloc #else # if __GNUC__ >= 3 EEALLOC_INLINE void *eemalloc (size_t n) __attribute__ ((__malloc__)) # if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) __attribute__ ((__alloc_size__ (1))) # endif ; # endif EEALLOC_INLINE void * eemalloc (size_t n) { /* If n is zero, allocate a 1-byte block. */ if (n == 0) n = 1; return malloc (n); } #endif #if REALLOC_0_IS_NONNULL # define eerealloc realloc #else # if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) EEALLOC_INLINE void *eerealloc (void *p, size_t n) __attribute__ ((__alloc_size__ (2))); # endif EEALLOC_INLINE void * eerealloc (void *p, size_t n) { /* If n is zero, allocate or keep a 1-byte block. */ if (n == 0) n = 1; return realloc (p, n); } #endif /* Maybe we should also define variants eenmalloc (size_t n, size_t s) - behaves like eemalloc (n * s) eezalloc (size_t n) - like eemalloc followed by memset 0 eecalloc (size_t n, size_t s) - like eemalloc (n * s) followed by memset 0 eenrealloc (void *p, size_t n, size_t s) - like eerealloc (p, n * s) If this would be useful in your application. please speak up. */ _GL_INLINE_HEADER_END #endif /* _EEALLOC_H */