Deleted Added
full compact
zalloc_malloc.c (39665) zalloc_malloc.c (39672)
1/*
2 * This module derived from code donated to the FreeBSD Project by
3 * Matthew Dillon <dillon@backplane.com>
4 *
5 * Copyright (c) 1998 The FreeBSD Project
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 12 unchanged lines hidden (view full) ---

21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
1/*
2 * This module derived from code donated to the FreeBSD Project by
3 * Matthew Dillon <dillon@backplane.com>
4 *
5 * Copyright (c) 1998 The FreeBSD Project
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 12 unchanged lines hidden (view full) ---

21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 * $Id$
29 * $Id: zalloc_malloc.c,v 1.1 1998/09/26 01:42:39 msmith Exp $
30 */
31
32/*
33 * MALLOC.C - malloc equivalent, runs on top of zalloc and uses sbrk
34 */
35
36#include "zalloc_defs.h"
37
38static MemPool MallocPool = INITPOOL("malloc", panic, znot);
39
40#ifdef DMALLOCDEBUG
41static int MallocMax;
42static int MallocCount;
43
44void mallocstats(void);
45#endif
46
30 */
31
32/*
33 * MALLOC.C - malloc equivalent, runs on top of zalloc and uses sbrk
34 */
35
36#include "zalloc_defs.h"
37
38static MemPool MallocPool = INITPOOL("malloc", panic, znot);
39
40#ifdef DMALLOCDEBUG
41static int MallocMax;
42static int MallocCount;
43
44void mallocstats(void);
45#endif
46
47#ifdef malloc
48#undef malloc
49#undef free
50#endif
51
47void *
48malloc(size_t bytes)
49{
50 Guard *res;
51
52#ifdef USEENDGUARD
53 bytes += MALLOCALIGN + 1;
54#else

--- 139 unchanged lines hidden ---
52void *
53malloc(size_t bytes)
54{
55 Guard *res;
56
57#ifdef USEENDGUARD
58 bytes += MALLOCALIGN + 1;
59#else

--- 139 unchanged lines hidden ---