diff options
| author | Russ Allbery <eagle@eyrie.org> | 2018-06-03 16:58:04 -0700 |
|---|---|---|
| committer | Russ Allbery <eagle@eyrie.org> | 2018-06-03 16:58:04 -0700 |
| commit | 52a00911071f6b1f61fc0a1f9c6f54bf38ab50a6 (patch) | |
| tree | f60df4fa425feede71437ea91e6176369a5ae3b6 /util/xmalloc.h | |
| parent | 6054a5b5806ed1e529b9fbed1c2284580f2a01be (diff) | |
| parent | edf31eba414d9a105791c076fb1444a78d210dff (diff) | |
Update upstream source from tag 'upstream/1.4'
Update to upstream version '1.4'
with Debian dir 0b0d636e76769b309abb838da9361d95c611ebfe
Diffstat (limited to 'util/xmalloc.h')
| -rw-r--r-- | util/xmalloc.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/util/xmalloc.h b/util/xmalloc.h index 6aa9b93..61f5ed1 100644 --- a/util/xmalloc.h +++ b/util/xmalloc.h @@ -2,14 +2,13 @@ * Prototypes for malloc routines with failure handling. * * The canonical version of this file is maintained in the rra-c-util package, - * which can be found at <http://www.eyrie.org/~eagle/software/rra-c-util/>. + * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>. * - * Copyright 2010, 2012, 2013, 2014 + * Written by Russ Allbery <eagle@eyrie.org> + * Copyright 2010, 2012-2014 * The Board of Trustees of the Leland Stanford Junior University - * Copyright (c) 2004, 2005, 2006 - * by Internet Systems Consortium, Inc. ("ISC") - * Copyright (c) 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, - * 2002, 2003 by The Internet Software Consortium and Rich Salz + * Copyright 2004-2006 Internet Systems Consortium, Inc. ("ISC") + * Copyright 1991, 1994-2003 The Internet Software Consortium and Rich Salz * * This code is derived from software contributed to the Internet Software * Consortium by Rich Salz. @@ -25,6 +24,8 @@ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. + * + * SPDX-License-Identifier: ISC */ #ifndef UTIL_XMALLOC_H @@ -110,7 +111,7 @@ typedef void (*xmalloc_handler_type)(const char *, size_t, const char *, int); /* The default error handler. */ void xmalloc_fail(const char *, size_t, const char *, int) - __attribute__((__nonnull__)); + __attribute__((__nonnull__, __noreturn__)); /* * Assign to this variable to choose a handler other than the default, which |