projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gettimeofday: port recent C++ fix to Emacs
[gnulib.git]
/
lib
/
obstack.c
diff --git
a/lib/obstack.c
b/lib/obstack.c
index
1bbf62b
..
f830fdc
100644
(file)
--- a/
lib/obstack.c
+++ b/
lib/obstack.c
@@
-1,22
+1,19
@@
/* obstack.c - subroutines used implicitly by object stack macros
/* obstack.c - subroutines used implicitly by object stack macros
- Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997,
- 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software
- Foundation, Inc.
+ Copyright (C) 1988-1994, 1996-2006, 2009-2013 Free Software Foundation, Inc.
- This program is free software
;
you can redistribute it and/or modify
+ 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
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.
+ 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.
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#ifdef _LIBC
# include <obstack.h>
#ifdef _LIBC
# include <obstack.h>
@@
-37,10
+34,10
@@
C Library, but also included in many other GNU distributions. Compiling
and linking in this code is a waste when using the GNU C library
(especially if it is a shared library). Rather than having every GNU
C Library, but also included in many other GNU distributions. Compiling
and linking in this code is a waste when using the GNU C library
(especially if it is a shared library). Rather than having every GNU
- program understand
`
configure --with-gnu-libc' and omit the object
+ program understand
'
configure --with-gnu-libc' and omit the object
files, it is simpler to just do this in the source for each such file. */
files, it is simpler to just do this in the source for each such file. */
-#include <stdio.h> /* Random thing to get __GNU_LIBRARY__. */
+#include <stdio.h>
/* Random thing to get __GNU_LIBRARY__. */
#if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
# include <gnu-versions.h>
# if _GNU_OBSTACK_INTERFACE_VERSION == OBSTACK_INTERFACE_VERSION
#if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
# include <gnu-versions.h>
# if _GNU_OBSTACK_INTERFACE_VERSION == OBSTACK_INTERFACE_VERSION
@@
-77,23
+74,23
@@
enum
/* When we copy a long block of data, this is the unit to do it with.
On some machines, copying successive ints does not work;
/* When we copy a long block of data, this is the unit to do it with.
On some machines, copying successive ints does not work;
- in such a case, redefine COPYING_UNIT to
`
long' (if that works)
- or
`
char' as a last resort. */
+ in such a case, redefine COPYING_UNIT to
'
long' (if that works)
+ or
'
char' as a last resort. */
# ifndef COPYING_UNIT
# define COPYING_UNIT int
# endif
# ifndef COPYING_UNIT
# define COPYING_UNIT int
# endif
-/* The functions allocating more room by calling
`
obstack_chunk_alloc'
- jump to the handler pointed to by
`
obstack_alloc_failed_handler'.
+/* The functions allocating more room by calling
'
obstack_chunk_alloc'
+ jump to the handler pointed to by
'
obstack_alloc_failed_handler'.
This can be set to a user defined function which should either
abort gracefully or use longjump - but shouldn't return. This
variable by default points to the internal function
This can be set to a user defined function which should either
abort gracefully or use longjump - but shouldn't return. This
variable by default points to the internal function
-
`
print_and_abort'. */
-static void print_and_abort (void);
+
'
print_and_abort'. */
+static
_Noreturn
void print_and_abort (void);
void (*obstack_alloc_failed_handler) (void) = print_and_abort;
void (*obstack_alloc_failed_handler) (void) = print_and_abort;
-/* Exit value used when
`
print_and_abort' is used. */
+/* Exit value used when
'
print_and_abort' is used. */
# include <stdlib.h>
# ifdef _LIBC
int obstack_exit_failure = EXIT_FAILURE;
# include <stdlib.h>
# ifdef _LIBC
int obstack_exit_failure = EXIT_FAILURE;
@@
-142,9
+139,9
@@
compat_symbol (libc, _obstack_compat, _obstack, GLIBC_2_0);
int
_obstack_begin (struct obstack *h,
int
_obstack_begin (struct obstack *h,
- int size, int alignment,
- void *(*chunkfun) (long),
- void (*freefun) (void *))
+
int size, int alignment,
+
void *(*chunkfun) (long),
+
void (*freefun) (void *))
{
register struct _obstack_chunk *chunk; /* points to new chunk */
{
register struct _obstack_chunk *chunk; /* points to new chunk */
@@
-154,16
+151,16
@@
_obstack_begin (struct obstack *h,
/* Default size is what GNU malloc can fit in a 4096-byte block. */
{
/* 12 is sizeof (mhead) and 4 is EXTRA from GNU malloc.
/* Default size is what GNU malloc can fit in a 4096-byte block. */
{
/* 12 is sizeof (mhead) and 4 is EXTRA from GNU malloc.
- Use the values for range checking, because if range checking is off,
- the extra bytes won't be missed terribly, but if range checking is on
- and we used a larger request, a whole extra 4096 bytes would be
- allocated.
+
Use the values for range checking, because if range checking is off,
+
the extra bytes won't be missed terribly, but if range checking is on
+
and we used a larger request, a whole extra 4096 bytes would be
+
allocated.
- These number are irrelevant to the new GNU malloc. I suspect it is
- less sensitive to the size of the request. */
+
These number are irrelevant to the new GNU malloc. I suspect it is
+
less sensitive to the size of the request. */
int extra = ((((12 + DEFAULT_ROUNDING - 1) & ~(DEFAULT_ROUNDING - 1))
int extra = ((((12 + DEFAULT_ROUNDING - 1) & ~(DEFAULT_ROUNDING - 1))
- + 4 + DEFAULT_ROUNDING - 1)
- & ~(DEFAULT_ROUNDING - 1));
+
+ 4 + DEFAULT_ROUNDING - 1)
+
& ~(DEFAULT_ROUNDING - 1));
size = 4096 - extra;
}
size = 4096 - extra;
}
@@
-177,7
+174,7
@@
_obstack_begin (struct obstack *h,
if (!chunk)
(*obstack_alloc_failed_handler) ();
h->next_free = h->object_base = __PTR_ALIGN ((char *) chunk, chunk->contents,
if (!chunk)
(*obstack_alloc_failed_handler) ();
h->next_free = h->object_base = __PTR_ALIGN ((char *) chunk, chunk->contents,
- alignment - 1);
+
alignment - 1);
h->chunk_limit = chunk->limit
= (char *) chunk + h->chunk_size;
chunk->prev = 0;
h->chunk_limit = chunk->limit
= (char *) chunk + h->chunk_size;
chunk->prev = 0;
@@
-189,9
+186,9
@@
_obstack_begin (struct obstack *h,
int
_obstack_begin_1 (struct obstack *h, int size, int alignment,
int
_obstack_begin_1 (struct obstack *h, int size, int alignment,
- void *(*chunkfun) (void *, long),
- void (*freefun) (void *, void *),
- void *arg)
+
void *(*chunkfun) (void *, long),
+
void (*freefun) (void *, void *),
+
void *arg)
{
register struct _obstack_chunk *chunk; /* points to new chunk */
{
register struct _obstack_chunk *chunk; /* points to new chunk */
@@
-201,16
+198,16
@@
_obstack_begin_1 (struct obstack *h, int size, int alignment,
/* Default size is what GNU malloc can fit in a 4096-byte block. */
{
/* 12 is sizeof (mhead) and 4 is EXTRA from GNU malloc.
/* Default size is what GNU malloc can fit in a 4096-byte block. */
{
/* 12 is sizeof (mhead) and 4 is EXTRA from GNU malloc.
- Use the values for range checking, because if range checking is off,
- the extra bytes won't be missed terribly, but if range checking is on
- and we used a larger request, a whole extra 4096 bytes would be
- allocated.
+
Use the values for range checking, because if range checking is off,
+
the extra bytes won't be missed terribly, but if range checking is on
+
and we used a larger request, a whole extra 4096 bytes would be
+
allocated.
- These number are irrelevant to the new GNU malloc. I suspect it is
- less sensitive to the size of the request. */
+
These number are irrelevant to the new GNU malloc. I suspect it is
+
less sensitive to the size of the request. */
int extra = ((((12 + DEFAULT_ROUNDING - 1) & ~(DEFAULT_ROUNDING - 1))
int extra = ((((12 + DEFAULT_ROUNDING - 1) & ~(DEFAULT_ROUNDING - 1))
- + 4 + DEFAULT_ROUNDING - 1)
- & ~(DEFAULT_ROUNDING - 1));
+
+ 4 + DEFAULT_ROUNDING - 1)
+
& ~(DEFAULT_ROUNDING - 1));
size = 4096 - extra;
}
size = 4096 - extra;
}
@@
-225,7
+222,7
@@
_obstack_begin_1 (struct obstack *h, int size, int alignment,
if (!chunk)
(*obstack_alloc_failed_handler) ();
h->next_free = h->object_base = __PTR_ALIGN ((char *) chunk, chunk->contents,
if (!chunk)
(*obstack_alloc_failed_handler) ();
h->next_free = h->object_base = __PTR_ALIGN ((char *) chunk, chunk->contents,
- alignment - 1);
+
alignment - 1);
h->chunk_limit = chunk->limit
= (char *) chunk + h->chunk_size;
chunk->prev = 0;
h->chunk_limit = chunk->limit
= (char *) chunk + h->chunk_size;
chunk->prev = 0;
@@
-246,7
+243,7
@@
_obstack_newchunk (struct obstack *h, int length)
{
register struct _obstack_chunk *old_chunk = h->chunk;
register struct _obstack_chunk *new_chunk;
{
register struct _obstack_chunk *old_chunk = h->chunk;
register struct _obstack_chunk *new_chunk;
- register long
new_size;
+ register long new_size;
register long obj_size = h->next_free - h->object_base;
register long i;
long already;
register long obj_size = h->next_free - h->object_base;
register long i;
long already;
@@
-275,12
+272,12
@@
_obstack_newchunk (struct obstack *h, int length)
if (h->alignment_mask + 1 >= DEFAULT_ALIGNMENT)
{
for (i = obj_size / sizeof (COPYING_UNIT) - 1;
if (h->alignment_mask + 1 >= DEFAULT_ALIGNMENT)
{
for (i = obj_size / sizeof (COPYING_UNIT) - 1;
- i >= 0; i--)
- ((COPYING_UNIT *)object_base)[i]
- = ((COPYING_UNIT *)h->object_base)[i];
+
i >= 0; i--)
+
((COPYING_UNIT *)object_base)[i]
+
= ((COPYING_UNIT *)h->object_base)[i];
/* We used to copy the odd few remaining bytes as one extra COPYING_UNIT,
/* We used to copy the odd few remaining bytes as one extra COPYING_UNIT,
- but that can cross a page boundary on a machine
- which does not do strict alignment for COPYING_UNITS. */
+
but that can cross a page boundary on a machine
+
which does not do strict alignment for COPYING_UNITS. */
already = obj_size / sizeof (COPYING_UNIT) * sizeof (COPYING_UNIT);
}
else
already = obj_size / sizeof (COPYING_UNIT) * sizeof (COPYING_UNIT);
}
else
@@
-294,8
+291,8
@@
_obstack_newchunk (struct obstack *h, int length)
But not if that chunk might contain an empty object. */
if (! h->maybe_empty_object
&& (h->object_base
But not if that chunk might contain an empty object. */
if (! h->maybe_empty_object
&& (h->object_base
- == __PTR_ALIGN ((char *) old_chunk, old_chunk->contents,
- h->alignment_mask)))
+
== __PTR_ALIGN ((char *) old_chunk, old_chunk->contents,
+
h->alignment_mask)))
{
new_chunk->prev = old_chunk->prev;
CALL_FREEFUN (h, old_chunk);
{
new_chunk->prev = old_chunk->prev;
CALL_FREEFUN (h, old_chunk);
@@
-316,13
+313,13
@@
libc_hidden_def (_obstack_newchunk)
/* Suppress -Wmissing-prototypes warning. We don't want to declare this in
obstack.h because it is just for debugging. */
/* Suppress -Wmissing-prototypes warning. We don't want to declare this in
obstack.h because it is just for debugging. */
-int _obstack_allocated_p (struct obstack *h, void *obj);
+int _obstack_allocated_p (struct obstack *h, void *obj)
_GL_ATTRIBUTE_PURE
;
int
_obstack_allocated_p (struct obstack *h, void *obj)
{
int
_obstack_allocated_p (struct obstack *h, void *obj)
{
- register struct _obstack_chunk *lp; /* below addr of any objects in this chunk */
- register struct _obstack_chunk *plp; /* point to previous chunk if any */
+ register struct _obstack_chunk *lp;
/* below addr of any objects in this chunk */
+ register struct _obstack_chunk *plp;
/* point to previous chunk if any */
lp = (h)->chunk;
/* We use >= rather than > since the object cannot be exactly at
lp = (h)->chunk;
/* We use >= rather than > since the object cannot be exactly at
@@
-342,10
+339,10
@@
_obstack_allocated_p (struct obstack *h, void *obj)
# undef obstack_free
void
# undef obstack_free
void
-obstack_free (struct obstack *h, void *obj)
+
__
obstack_free (struct obstack *h, void *obj)
{
{
- register struct _obstack_chunk *lp; /* below addr of any objects in this chunk */
- register struct _obstack_chunk *plp; /* point to previous chunk if any */
+ register struct _obstack_chunk *lp;
/* below addr of any objects in this chunk */
+ register struct _obstack_chunk *plp;
/* point to previous chunk if any */
lp = h->chunk;
/* We use >= because there cannot be an object at the beginning of a chunk.
lp = h->chunk;
/* We use >= because there cannot be an object at the beginning of a chunk.
@@
-357,7
+354,7
@@
obstack_free (struct obstack *h, void *obj)
CALL_FREEFUN (h, lp);
lp = plp;
/* If we switch chunks, we can't tell whether the new current
CALL_FREEFUN (h, lp);
lp = plp;
/* If we switch chunks, we can't tell whether the new current
- chunk contains an empty object, so assume that it may. */
+
chunk contains an empty object, so assume that it may. */
h->maybe_empty_object = 1;
}
if (lp)
h->maybe_empty_object = 1;
}
if (lp)
@@
-404,15
+401,7
@@
_obstack_memory_used (struct obstack *h)
# include <libio/iolibio.h>
# endif
# include <libio/iolibio.h>
# endif
-# ifndef __attribute__
-/* This feature is available in gcc versions 2.5 and later. */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
-# define __attribute__(Spec) /* empty */
-# endif
-# endif
-
-static void
-__attribute__ ((noreturn))
+static _Noreturn void
print_and_abort (void)
{
/* Don't change any of these strings. Yes, it would be possible to add
print_and_abort (void)
{
/* Don't change any of these strings. Yes, it would be possible to add
@@
-428,4
+417,4
@@
print_and_abort (void)
exit (obstack_exit_failure);
}
exit (obstack_exit_failure);
}
-#endif /* !ELIDE_CODE */
+#endif
/* !ELIDE_CODE */