rxvt-unicode/src/rxvtutil.C

/*----------------------------------------------------------------------*
 * File:        rxvtutil.C
 *----------------------------------------------------------------------*
 *
 * All portions of code are copyright by their respective author/s.
 * Copyright (c) 2004-2006 Marc Lehmann <schmorp@schmorp.de>
 *
 * 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; either version 3 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, write to the Free Software
 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 *----------------------------------------------------------------------*/

// we include emman.c here to avoid relying on a C compiler, or
// on the c++ compiler not complaining about .c, which is unlikely,
// but...
// This must be the first include, because the _GNU_SOURCE and
// _XOPEN_SOURCE macros, used by emman.c, must be defined before
// inclusion of any header.
#include "emman.c"

#include <stdlib.h>
#include <string.h>
#include <inttypes.h>

#include "rxvtutil.h"

void *
zero_initialized::operator new (size_t s)
{
  void *p = malloc (s);

  memset (p, 0, s);
  return p;
}

void
zero_initialized::operator delete (void *p, size_t s)
{
  free (p);
}

static void *temp_buf;
static uint32_t temp_len;

void *
rxvt_temp_buf (int len)
{
  if (len > temp_len)
    {
      free (temp_buf);
      temp_buf = malloc (len);
      temp_len = len;
    }

  return temp_buf;
}

Revision:	1.22
Committed:	Wed Nov 12 12:12:02 2014 UTC (9 years, 6 months ago) by sf-exg
Content type:	text/plain
Branch:	MAIN
CVS Tags:	rxvt-unicode-rel-9_29, rxvt-unicode-rel-9_26, rxvt-unicode-rel-9_25, rxvt-unicode-rel-9_22, rxvt-unicode-rel-9_21, rxvt-unicode-rel-9_30, HEAD
Changes since 1.21:	+0 -13 lines
Log Message:	Make new/delete compatible with C++11 and change new to use rxvt_malloc.
#	User	Rev	Content
1	root	1.7	/----------------------------------------------------------------------
2	root	1.6	* File: rxvtutil.C
3			----------------------------------------------------------------------
4			*
5			* All portions of code are copyright by their respective author/s.
6	root	1.13	* Copyright (c) 2004-2006 Marc Lehmann <schmorp@schmorp.de>
7	root	1.6	*
8			* This program is free software; you can redistribute it and/or modify
9			* it under the terms of the GNU General Public License as published by
10	root	1.19	* the Free Software Foundation; either version 3 of the License, or
11	root	1.6	* (at your option) any later version.
12			*
13			* This program is distributed in the hope that it will be useful,
14			* but WITHOUT ANY WARRANTY; without even the implied warranty of
15			* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16			* GNU General Public License for more details.
17			*
18			* You should have received a copy of the GNU General Public License
19			* along with this program; if not, write to the Free Software
20			* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21			----------------------------------------------------------------------/
22
23	sf-exg	1.20	// we include emman.c here to avoid relying on a C compiler, or
24			// on the c++ compiler not complaining about .c, which is unlikely,
25			// but...
26			// This must be the first include, because the _GNU_SOURCE and
27			// _XOPEN_SOURCE macros, used by emman.c, must be defined before
28			// inclusion of any header.
29			#include "emman.c"
30
31	sf-exg	1.17	#include <stdlib.h>
32			#include <string.h>
33	sf-exg	1.16	#include <inttypes.h>
34	root	1.1
35			#include "rxvtutil.h"
36
37	root	1.2	void *
38			zero_initialized::operator new (size_t s)
39			{
40			void *p = malloc (s);
41
42			memset (p, 0, s);
43			return p;
44			}
45
46			void
47			zero_initialized::operator delete (void *p, size_t s)
48			{
49			free (p);
50			}
51
52	root	1.3	static void *temp_buf;
53			static uint32_t temp_len;
54
55			void *
56			rxvt_temp_buf (int len)
57			{
58			if (len > temp_len)
59	ayin	1.9	{
60	sf-exg	1.12	free (temp_buf);
61			temp_buf = malloc (len);
62	root	1.3	temp_len = len;
63			}
64	ayin	1.9
65	root	1.3	return temp_buf;
66			}
67	root	1.1