From 149786d5636601988d126927a64ce517690ee49c Mon Sep 17 00:00:00 2001 From: Ulf Lamping Date: Fri, 5 Aug 2005 23:58:58 +0000 Subject: replace malloc and alike calls by their GLib pendants -> g_malloc svn path=/trunk/; revision=15232 --- capture_stop_conditions.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'capture_stop_conditions.c') diff --git a/capture_stop_conditions.c b/capture_stop_conditions.c index 1eb7a443cd..6c1b9e83c7 100644 --- a/capture_stop_conditions.c +++ b/capture_stop_conditions.c @@ -84,7 +84,7 @@ typedef struct _cnd_timeout_dat{ static condition* _cnd_constr_timeout(condition* cnd, va_list ap){ cnd_timeout_dat *data = NULL; /* allocate memory */ - if((data = (cnd_timeout_dat*)malloc(sizeof(cnd_timeout_dat))) == NULL) + if((data = (cnd_timeout_dat*)g_malloc(sizeof(cnd_timeout_dat))) == NULL) return NULL; /* initialize user data */ data->start_time = time(NULL); @@ -101,7 +101,7 @@ static condition* _cnd_constr_timeout(condition* cnd, va_list ap){ */ static void _cnd_destr_timeout(condition* cnd){ /* free memory */ - free(cnd_get_user_data(cnd)); + g_free(cnd_get_user_data(cnd)); } /* END _cnd_destr_timeout() */ /* @@ -159,7 +159,7 @@ typedef struct _cnd_capturesize_dat{ static condition* _cnd_constr_capturesize(condition* cnd, va_list ap){ cnd_capturesize_dat *data = NULL; /* allocate memory */ - if((data = (cnd_capturesize_dat*)malloc(sizeof(cnd_capturesize_dat))) == NULL) + if((data = (cnd_capturesize_dat*)g_malloc(sizeof(cnd_capturesize_dat))) == NULL) return NULL; /* initialize user data */ data->max_capture_size = va_arg(ap, long); @@ -175,7 +175,7 @@ static condition* _cnd_constr_capturesize(condition* cnd, va_list ap){ */ static void _cnd_destr_capturesize(condition* cnd){ /* free memory */ - free(cnd_get_user_data(cnd)); + g_free(cnd_get_user_data(cnd)); } /* END _cnd_destr_capturesize() */ /* -- cgit v1.2.1