aboutsummaryrefslogtreecommitdiffstats
path: root/epan/except.c
diff options
context:
space:
mode:
authorkrj <krj@f5534014-38df-0310-8fa8-9805f1628bb7>2009-08-15 09:13:16 +0000
committerkrj <krj@f5534014-38df-0310-8fa8-9805f1628bb7>2009-08-15 09:13:16 +0000
commita75cb39e77956ad0ba147fa34f7b7820dc88d78f (patch)
tree881e1ab801bfa5aacf7e26b4f259e5f1ac498890 /epan/except.c
parent33a04269977a12eb90eae00aef670f4ef47923f6 (diff)
Switch over to using GLib's g_malloc/g_free in the name of consistency.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29430 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/except.c')
-rw-r--r--epan/except.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/except.c b/epan/except.c
index 0408eda29e..f740ebc012 100644
--- a/epan/except.c
+++ b/epan/except.c
@@ -139,8 +139,8 @@ void except_deinit(void)
static int init_counter;
static void unhandled_catcher(except_t *);
static void (*uh_catcher_ptr)(except_t *) = unhandled_catcher;
-static void *(*allocator)(size_t) = malloc;
-static void (*deallocator)(void *) = free;
+static void *(*allocator)(size_t) = g_malloc;
+static void (*deallocator)(void *) = g_free;
static struct except_stacknode *stack_top;
#define get_top() (stack_top)