picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

unify xmalloc prototypes & friends

Browse source 
These prototypes are duplicated in many places.  Add a dedicated
header for holding prototypes for program-specific functions to
avoid that.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2012-12-30 17:41:42 -05:00
parent 4bf6b9dd8e
commit 6ff444c418
13 changed files with 60 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ChangeLog
View file

@ -1,3 +1,19 @@
2013-02-18 Mike Frysinger <vapier@gentoo.org>
* include/programs/xmalloc.h: New file.
* catgets/gencat.c: Include it.
(xmalloc, xcalloc, xrealloc, xstrdup): Don't declare them.
* elf/pldd.c: Likewise.
* iconv/iconv_charmap.c: Likewise.
* iconv/iconvconfig.c: Likewise.
* iconv/strtab.c: Likewise.
* locale/programs/locale.c: Likewise.
* locale/programs/localedef.h: Likewise.
* locale/programs/simple-hash.c: Likewise.
* nscd/nscd.h: Likewise.
* nss/makedb.c: Likewise.
* sysdeps/generic/ldconfig.h: Likewise.
2013-02-18 Siddhesh Poyarekar <siddhesh@redhat.com>
* Versions.def: Add GLIBC_2.18.

8
catgets/gencat.c
View file

@ -137,13 +137,7 @@ static struct argp argp =
/* Wrapper functions with error checking for standard functions. */
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);
extern char *xstrdup (const char *) __attribute_malloc__;
#include <programs/xmalloc.h>
/* Prototypes for local functions. */
static void error_print (void);

5
elf/pldd.c
View file

@ -43,10 +43,7 @@ extern char *program_invocation_short_name;
#define PACKAGE _libc_intl_domainname
/* External functions. */
extern void *xmalloc (size_t n)
__attribute_malloc__ __attribute_alloc_size (1);
extern void *xrealloc (void *o, size_t n)
__attribute_malloc__ __attribute_alloc_size (2);
#include <programs/xmalloc.h>
/* Name and version of program. */
static void print_version (FILE *stream, struct argp_state *state);

5
iconv/iconv_charmap.c
View file

@ -32,10 +32,7 @@
/* Prototypes for a few program-wide used functions. */
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);
#include <programs/xmalloc.h>
struct convtable

7
iconv/iconvconfig.c
View file

@ -247,12 +247,7 @@ static struct
static const char gconv_module_ext[] = MODULE_EXT;
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);
#include <programs/xmalloc.h>
/* C string table handling. */

3
iconv/strtab.c
View file

@ -65,8 +65,7 @@ struct Strtab
static size_t ps;
extern void *xmalloc (size_t n)
__attribute_malloc__ __attribute_alloc_size (1);
#include <programs/xmalloc.h>
/* Prototypes for our functions that are used from iconvconfig.c. If
you change these, change also iconvconfig.c. */

33
include/programs/xmalloc.h Normal file
View file

@ -0,0 +1,33 @@
/* Memory related definitions for program modules.
Copyright (C) 1998-2013 Free Software Foundation, Inc.
This file is part of the GNU C Library.
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 the Free Software Foundation; version 2 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.
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>. */
#ifndef _XMALLOC_H
#define _XMALLOC_H 1
#include <sys/cdefs.h>
#include <stddef.h>
/* Prototypes for a few program-wide used functions. */
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);
extern char *xstrdup (const char *) __attribute_malloc__;
#endif /* xmalloc.h */

5
locale/programs/locale.c
View file

@ -42,10 +42,7 @@
#include "localeinfo.h"
#include "charmap-dir.h"
#include "../locarchive.h"
extern void *xmalloc (size_t n)
__attribute_malloc__ __attribute_alloc_size (1);
extern char *xstrdup (const char *) __attribute_malloc__;
#include <programs/xmalloc.h>
#define ARCHIVE_NAME LOCALEDIR "/locale-archive"

8
locale/programs/localedef.h
View file

@ -120,13 +120,7 @@ extern const char *alias_file;
/* Prototypes for a few program-wide used functions. */
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);
extern char *xstrdup (const char *) __attribute_malloc__;
#include <programs/xmalloc.h>
/* Wrapper to switch LC_CTYPE back to the locale specified in the

5
locale/programs/simple-hash.c
View file

@ -52,10 +52,7 @@
#define hashval_t uint32_t
#include "hashval.h"
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);
#include <programs/xmalloc.h>
typedef struct hash_entry
{

7
nscd/nscd.h
View file

@ -200,12 +200,7 @@ extern gid_t old_gid;
/* Prototypes for global functions. */
/* Wrapper functions with error checking for standard functions. */
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);
#include <programs/xmalloc.h>
/* nscd.c */
extern void termination_handler (int signum) __attribute__ ((__noreturn__));

5
nss/makedb.c
View file

@ -173,10 +173,7 @@ static void reset_file_creation_context (void);
/* External functions. */
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);
#include <programs/xmalloc.h>
int

8
sysdeps/generic/ldconfig.h
View file

@ -84,12 +84,6 @@ extern int opt_verbose;
extern int opt_format;
/* Prototypes for a few program-wide used functions. */
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);
extern char *xstrdup (const char *) __attribute_malloc__;
#include <programs/xmalloc.h>
#endif /* ! _LDCONFIG_H */