From 5576146ede40b42bc632fd9697dd429a4d1409cf Mon Sep 17 00:00:00 2001 From: "Neal H. Walfield" Date: Tue, 29 Sep 2015 13:24:48 +0200 Subject: [PATCH] common: Remove unused files. * common/xmalloc.c: Remove file. * common/xmalloc.h: Remove file. -- Signed-off-by: Neal H. Walfield . --- common/xmalloc.c | 112 ----------------------------------------------- common/xmalloc.h | 41 ----------------- 2 files changed, 153 deletions(-) delete mode 100644 common/xmalloc.c delete mode 100644 common/xmalloc.h diff --git a/common/xmalloc.c b/common/xmalloc.c deleted file mode 100644 index 0690a3696..000000000 --- a/common/xmalloc.c +++ /dev/null @@ -1,112 +0,0 @@ -/* xmalloc.c - standard malloc wrappers - * Copyright (C) 1999, 2000, 2001, 2006 Free Software Foundation, Inc. - * - * This file is part of GnuPG. - * - * GnuPG is free software; you can redistribute it and/or modify it - * under the terms of either - * - * - the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 3 of the License, or (at - * your option) any later version. - * - * or - * - * - the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at - * your option) any later version. - * - * or both in parallel, as here. - * - * GnuPG 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 copies of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, see . - */ - -#include -#include -#include -#include - -#include "libjnlib-config.h" -#include "xmalloc.h" - -static void -out_of_core(void) -{ - fputs("\nfatal: out of memory\n", stderr ); - exit(2); -} - - -void * -xmalloc( size_t n ) -{ - void *p; - - /* Make sure that xmalloc (0) works. This is the same behaviour - has in gpg 2.x. Note that in contrast to this code, Libgcrypt - (and thus most xmallocs in gpg 2.x) detect the !n and bail out. */ - if (!n) - n = 1; - - p = malloc( n ); - if( !p ) - out_of_core(); - return p; -} - -void * -xrealloc( void *a, size_t n ) -{ - void *p = realloc( a, n ); - if( !p ) - out_of_core(); - return p; -} - -void * -xcalloc( size_t n, size_t m ) -{ - void *p; - - if (!n) - n = 1; - if (!m) - m = 1; - - p = calloc( n, m ); - if( !p ) - out_of_core(); - return p; -} - -char * -xstrdup( const char *string ) -{ - void *p = xmalloc( strlen(string)+1 ); - strcpy( p, string ); - return p; -} - - -char * -xstrcat2( const char *a, const char *b ) -{ - size_t n1; - char *p; - - if( !b ) - return xstrdup( a ); - - n1 = strlen(a); - p = xmalloc( n1 + strlen(b) + 1 ); - memcpy(p, a, n1 ); - strcpy(p+n1, b ); - return p; -} diff --git a/common/xmalloc.h b/common/xmalloc.h deleted file mode 100644 index d91883d15..000000000 --- a/common/xmalloc.h +++ /dev/null @@ -1,41 +0,0 @@ -/* xmalloc.h - * Copyright (C) 1999, 2000, 2001, 2006 Free Software Foundation, Inc. - * - * This file is part of GnuPG. - * - * GnuPG is free software; you can redistribute it and/or modify it - * under the terms of either - * - * - the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 3 of the License, or (at - * your option) any later version. - * - * or - * - * - the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at - * your option) any later version. - * - * or both in parallel, as here. - * - * GnuPG 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 copies of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, see . - */ - -#ifndef GNUPG_COMMON_XMALLOC_H -#define GNUPG_COMMON_XMALLOC_H - -void *xmalloc( size_t n ); -void *xrealloc( void *a, size_t n ); -void *xcalloc( size_t n, size_t m ); -char *xstrdup( const char *string ); -char *xstrcat2( const char *a, const char *b ); - - -#endif /*GNUPG_COMMON_XMALLOC_H*/