Mercurial > hg > octave-kai > gnulib-hg
annotate lib/eealloc.h @ 17101:99fa3b05f1c8
pipe-filter-gi, pipe-filter-ii: better use of 'inline'
* lib/pipe-filter-aux.c: New file.
* lib/pipe-filter-aux.h (PIPE_FILTER_AUX_INLINE): New macro.
Replace all uses of 'static inline' with it.
Use _GL_INLINE_HEADER_BEGIN, _GL_INLINE_HEADER_END.
* lib/pipe-filter-gi.c (filter_init, filter_cleanup)
(filter_retcode): No real need for inline here.
* modules/pipe-filter-gi, modules/pipe-filter-ii:
(Files): Add lib/pipe-filter-aux.c.
(Depends-on): Add extern-inline.
(configure.ac): Do not require AC_C_INLINE.
(lib_SOURCES): Add pipe-filter-aux.c.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Wed, 29 Aug 2012 22:17:49 -0700 |
parents | 8250f2777afc |
children | 9e72d3927af1 |
rev | line source |
---|---|
4919 | 1 /* Memory allocation with expensive empty allocations. |
16201
8250f2777afc
maint: update all copyright year number ranges
Jim Meyering <meyering@redhat.com>
parents:
14079
diff
changeset
|
2 Copyright (C) 2003, 2008, 2010-2012 Free Software Foundation, Inc. |
4919 | 3 Written by Bruno Haible <bruno@clisp.org>, 2003, |
4 based on prior work by Jim Meyering. | |
5 | |
9309
bbbbbf4cd1c5
Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents:
5848
diff
changeset
|
6 This program is free software: you can redistribute it and/or modify |
4919 | 7 it under the terms of the GNU General Public License as published by |
9309
bbbbbf4cd1c5
Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents:
5848
diff
changeset
|
8 the Free Software Foundation; either version 3 of the License, or |
bbbbbf4cd1c5
Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents:
5848
diff
changeset
|
9 (at your option) any later version. |
4919 | 10 |
11 This program is distributed in the hope that it will be useful, | |
12 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
14 GNU General Public License for more details. | |
15 | |
16 You should have received a copy of the GNU General Public License | |
9309
bbbbbf4cd1c5
Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents:
5848
diff
changeset
|
17 along with this program. If not, see <http://www.gnu.org/licenses/>. */ |
4919 | 18 |
19 #ifndef _EEALLOC_H | |
20 #define _EEALLOC_H | |
21 | |
22 /* malloc() and realloc() are allowed to return NULL when asked to allocate | |
23 a memory block of 0 bytes; this is not an out-of-memory condition. | |
24 (See ISO C 99 section 7.20.3.) In some places, this is not welcome, | |
25 because it requires extra checking (so as not to confuse a zero-sized | |
26 allocation with an out-of-memory condition). This file provides | |
27 malloc()/realloc() workalikes which return non-NULL pointers for | |
28 succeeding zero-sized allocations. GNU libc already defines malloc() | |
29 and realloc() this way; on such platforms the workalikes are aliased | |
30 to the original malloc()/realloc() functions. */ | |
31 | |
32 #include <stdlib.h> | |
33 | |
34 #if MALLOC_0_IS_NONNULL | |
35 # define eemalloc malloc | |
36 #else | |
10074
cf0a8e173c39
Help GCC to do better code generation.
Bruno Haible <bruno@clisp.org>
parents:
9309
diff
changeset
|
37 # if __GNUC__ >= 3 |
13815
86abc8c3b7d9
Make use of GCC's attribute __alloc_size__.
Bruno Haible <bruno@clisp.org>
parents:
12559
diff
changeset
|
38 static inline void *eemalloc (size_t n) |
86abc8c3b7d9
Make use of GCC's attribute __alloc_size__.
Bruno Haible <bruno@clisp.org>
parents:
12559
diff
changeset
|
39 __attribute__ ((__malloc__)) |
86abc8c3b7d9
Make use of GCC's attribute __alloc_size__.
Bruno Haible <bruno@clisp.org>
parents:
12559
diff
changeset
|
40 # if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) |
86abc8c3b7d9
Make use of GCC's attribute __alloc_size__.
Bruno Haible <bruno@clisp.org>
parents:
12559
diff
changeset
|
41 __attribute__ ((__alloc_size__ (1))) |
86abc8c3b7d9
Make use of GCC's attribute __alloc_size__.
Bruno Haible <bruno@clisp.org>
parents:
12559
diff
changeset
|
42 # endif |
86abc8c3b7d9
Make use of GCC's attribute __alloc_size__.
Bruno Haible <bruno@clisp.org>
parents:
12559
diff
changeset
|
43 ; |
10074
cf0a8e173c39
Help GCC to do better code generation.
Bruno Haible <bruno@clisp.org>
parents:
9309
diff
changeset
|
44 # endif |
4919 | 45 static inline void * |
46 eemalloc (size_t n) | |
47 { | |
48 /* If n is zero, allocate a 1-byte block. */ | |
49 if (n == 0) | |
50 n = 1; | |
51 return malloc (n); | |
52 } | |
53 #endif | |
54 | |
55 #if REALLOC_0_IS_NONNULL | |
56 # define eerealloc realloc | |
57 #else | |
13815
86abc8c3b7d9
Make use of GCC's attribute __alloc_size__.
Bruno Haible <bruno@clisp.org>
parents:
12559
diff
changeset
|
58 # if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) |
86abc8c3b7d9
Make use of GCC's attribute __alloc_size__.
Bruno Haible <bruno@clisp.org>
parents:
12559
diff
changeset
|
59 static inline void *eerealloc (void *p, size_t n) |
86abc8c3b7d9
Make use of GCC's attribute __alloc_size__.
Bruno Haible <bruno@clisp.org>
parents:
12559
diff
changeset
|
60 __attribute__ ((__alloc_size__ (2))); |
86abc8c3b7d9
Make use of GCC's attribute __alloc_size__.
Bruno Haible <bruno@clisp.org>
parents:
12559
diff
changeset
|
61 # endif |
4919 | 62 static inline void * |
63 eerealloc (void *p, size_t n) | |
64 { | |
65 /* If n is zero, allocate or keep a 1-byte block. */ | |
66 if (n == 0) | |
67 n = 1; | |
68 return realloc (p, n); | |
69 } | |
70 #endif | |
71 | |
72 /* Maybe we should also define variants | |
73 eenmalloc (size_t n, size_t s) - behaves like eemalloc (n * s) | |
74 eezalloc (size_t n) - like eemalloc followed by memset 0 | |
75 eecalloc (size_t n, size_t s) - like eemalloc (n * s) followed by memset 0 | |
76 eenrealloc (void *p, size_t n, size_t s) - like eerealloc (p, n * s) | |
77 If this would be useful in your application. please speak up. */ | |
78 | |
79 #endif /* _EEALLOC_H */ |