]>
Commit | Line | Data |
---|---|---|
6c2dd2d6 | 1 | diff -Nurb b.poldek-0.18.7/capreq.c n.poldek-0.18.7/capreq.c |
2 | --- b.poldek-0.18.7/capreq.c 2004-01-10 14:04:48.000000000 +0100 | |
3 | +++ n.poldek-0.18.7/capreq.c 2004-11-11 15:11:01.501825408 +0100 | |
4 | @@ -39,7 +39,7 @@ | |
5 | #include "misc.h" | |
6 | ||
7 | static void *(*capreq_alloc_fn)(size_t) = n_malloc; | |
8 | -static void (*capreq_free_fn)(void*) = n_free; | |
9 | +static void (*capreq_free_fn)(void*) = free; | |
10 | ||
11 | void set_capreq_allocfn(void *(*cr_allocfn)(size_t), void (*cr_freefn)(void*), | |
12 | void **prev_alloc, void **prev_free) | |
13 | diff -Nurb b.poldek-0.18.7/fileindex.c n.poldek-0.18.7/fileindex.c | |
14 | --- b.poldek-0.18.7/fileindex.c 2004-09-25 16:16:06.000000000 +0200 | |
15 | +++ n.poldek-0.18.7/fileindex.c 2004-11-11 15:11:28.151774000 +0100 | |
16 | @@ -26,7 +26,7 @@ | |
17 | #include "fileindex.h" | |
18 | ||
19 | #define obstack_chunk_alloc n_malloc | |
20 | -#define obstack_chunk_free n_free | |
21 | +#define obstack_chunk_free free | |
22 | ||
23 | struct file_ent { | |
24 | struct flfile *flfile; | |
25 | diff -Nurb b.poldek-0.18.7/pkg.c n.poldek-0.18.7/pkg.c | |
26 | --- b.poldek-0.18.7/pkg.c 2004-09-25 16:15:36.000000000 +0200 | |
27 | +++ n.poldek-0.18.7/pkg.c 2004-11-11 15:12:03.494401104 +0100 | |
28 | @@ -35,7 +35,7 @@ | |
29 | int poldek_conf_promote_epoch = 0; | |
30 | ||
31 | static void *(*pkg_alloc_fn)(size_t) = n_malloc; | |
32 | -static void (*pkg_free_fn)(void*) = n_free; | |
33 | +static void (*pkg_free_fn)(void*) = free; | |
34 | ||
35 | #if 0 /* disabled cause gives not reasonable profit */ | |
36 | void set_pkg_allocfn(void *(*pkg_allocfn)(size_t), void (*pkg_freefn)(void*)) | |
37 | diff -Nurb b.poldek-0.18.7/pkgfl.c n.poldek-0.18.7/pkgfl.c | |
38 | --- b.poldek-0.18.7/pkgfl.c 2004-07-05 21:11:25.000000000 +0200 | |
39 | +++ n.poldek-0.18.7/pkgfl.c 2004-11-11 15:12:28.333624968 +0100 | |
40 | @@ -34,7 +34,7 @@ | |
41 | #include "h2n.h" | |
42 | ||
43 | #define obstack_chunk_alloc n_malloc | |
44 | -#define obstack_chunk_free n_free | |
45 | +#define obstack_chunk_free free | |
46 | ||
47 | struct flmark { | |
48 | tn_array *dirs; | |
49 | diff -Nurb b.poldek-0.18.7/pkgset.c n.poldek-0.18.7/pkgset.c | |
50 | --- b.poldek-0.18.7/pkgset.c 2004-07-02 19:42:40.000000000 +0200 | |
51 | +++ n.poldek-0.18.7/pkgset.c 2004-11-11 15:13:01.797537680 +0100 | |
52 | @@ -49,7 +49,7 @@ | |
53 | int ask_pkg(const char *capname, struct pkg **pkgs, struct pkg *deflt); | |
54 | ||
55 | #define obstack_chunk_alloc n_malloc | |
56 | -#define obstack_chunk_free n_free | |
57 | +#define obstack_chunk_free free | |
58 | ||
59 | struct obstack_s { | |
60 | int ucnt; | |
61 | @@ -471,7 +471,7 @@ | |
62 | pkgset_order(ps); | |
63 | mem_info(1, "MEM after order"); | |
64 | ||
65 | - set_capreq_allocfn(n_malloc, n_free, NULL, NULL); | |
66 | + set_capreq_allocfn(n_malloc, free, NULL, NULL); | |
67 | return ps->nerrors == 0; | |
68 | } | |
69 | ||
70 | diff -Nurb b.poldek-0.18.7/trurlib/xmalloc.c n.poldek-0.18.7/trurlib/xmalloc.c | |
71 | --- b.poldek-0.18.7/trurlib/xmalloc.c 2002-05-06 19:01:04.000000000 +0200 | |
72 | +++ n.poldek-0.18.7/trurlib/xmalloc.c 2004-11-11 15:13:50.949065512 +0100 | |
73 | @@ -23,6 +23,6 @@ | |
74 | ||
75 | void xfree(void *ptr) | |
76 | { | |
77 | - n_free(ptr); | |
78 | + free(ptr); | |
79 | } | |
80 |