diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2012-01-08 21:19:43 -0500 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2012-01-08 21:19:43 -0500 |
| commit | ec09c1c410d40386ec3e5d2d82fc5c378b4b2681 (patch) | |
| tree | 2189714f7efcfc502ddef885c7c1d541eae6684c /nscd | |
| parent | aebae0537dcb408100b88c6b7647a7e858c43237 (diff) | |
Optimize xmalloc, xcalloc, xrealloc, and xstrdup
Add alloc_size attribute and apply consistently the malloc attribute
to xmalloc, xcalloc, xrealloc, and xstrdup.
Diffstat (limited to 'nscd')
| -rw-r--r-- | nscd/mem.c | 7 | ||||
| -rw-r--r-- | nscd/nscd.h | 11 |
2 files changed, 8 insertions, 10 deletions
diff --git a/nscd/mem.c b/nscd/mem.c index fcea6dbd03..8ba2ef6f85 100644 --- a/nscd/mem.c +++ b/nscd/mem.c @@ -1,5 +1,5 @@ /* Cache memory handling. - Copyright (C) 2004, 2005, 2006, 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 2004-2006, 2008, 2009, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2004. @@ -35,11 +35,6 @@ #include "nscd.h" -/* Wrapper functions with error checking for standard functions. */ -extern void *xmalloc (size_t n); -extern void *xcalloc (size_t n, size_t s); - - static int sort_he (const void *p1, const void *p2) { diff --git a/nscd/nscd.h b/nscd/nscd.h index fdaf01bfbe..9ac4379b80 100644 --- a/nscd/nscd.h +++ b/nscd/nscd.h @@ -1,4 +1,4 @@ -/* Copyright (c) 1998-2001, 2003-2009, 2011 Free Software Foundation, Inc. +/* Copyright (c) 1998-2001, 2003-2009, 2011, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk <kukuk@suse.de>, 1998. @@ -201,9 +201,12 @@ extern gid_t old_gid; /* Prototypes for global functions. */ /* Wrapper functions with error checking for standard functions. */ -extern void *xmalloc (size_t n); -extern void *xcalloc (size_t n, size_t s); -extern void *xrealloc (void *o, size_t n); +extern void *xmalloc (size_t n) + __attribute_malloc__ __attribute_alloc_size (1); +extern void *xcalloc (size_t n, size_t s) + __attribute_malloc__ __attribute_alloc_size (1, 2); +extern void *xrealloc (void *o, size_t n) + __attribute_malloc__ __attribute_alloc_size (2); /* nscd.c */ extern void termination_handler (int signum) __attribute__ ((__noreturn__)); |