projects
/
debian
/
tar
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Import upstream version 1.28
[debian/tar]
/
gnu
/
obstack.c
diff --git
a/gnu/obstack.c
b/gnu/obstack.c
index 7f1aa6b85b95028205bd7cacda4541336757e91d..1aba44c490afa502dd582fc009db025d079c3c1c 100644
(file)
--- a/
gnu/obstack.c
+++ b/
gnu/obstack.c
@@
-2,9
+2,7
@@
/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
/* obstack.c - subroutines used implicitly by object stack macros
/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
/* 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, 2009, 2010 Free Software
- Foundation, Inc.
+ Copyright (C) 1988-1994, 1996-2006, 2009-2014 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
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
@@
-38,7
+36,7
@@
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. */
#include <stdio.h> /* Random thing to get __GNU_LIBRARY__. */
files, it is simpler to just do this in the source for each such file. */
#include <stdio.h> /* Random thing to get __GNU_LIBRARY__. */
@@
-78,23
+76,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;
@@
-317,7
+315,7
@@
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)
@@
-405,15
+403,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