From a527425f008547b2169d165fee9b8c1402fa1df2 Mon Sep 17 00:00:00 2001 From: Dmitriy Paliy Date: Thu, 11 Nov 2010 22:46:19 +0200 Subject: [PATCH] obexd: Use g_string_free instead of string_free in IRMC g_string_free instead of string_free shall be used in IRMC plugin. string_free is a callback function specific to filesystem plugin only and used by OBEX drivers to close an OBEX object. --- obexd/plugins/irmc.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/obexd/plugins/irmc.c b/obexd/plugins/irmc.c index 28c5e50a3..f7ad33b62 100644 --- a/obexd/plugins/irmc.c +++ b/obexd/plugins/irmc.c @@ -254,10 +254,8 @@ static void irmc_disconnect(struct obex_session *os, void *user_data) g_free(irmc->params); } - if (irmc->buffer) { - string_free(irmc->buffer); - irmc->buffer = NULL; - } + if (irmc->buffer) + g_string_free(irmc->buffer, TRUE); g_free(irmc); } @@ -355,7 +353,7 @@ static void *irmc_open_pb(const char *name, struct irmc_session *irmc, irmc->buffer = mybuf; else { irmc->buffer = g_string_append(irmc->buffer, mybuf->str); - string_free(mybuf); + g_string_free(mybuf, TRUE); } return irmc; @@ -433,7 +431,7 @@ static int irmc_close(void *object) DBG(""); if (irmc->buffer) { - string_free(irmc->buffer); + g_string_free(irmc->buffer, TRUE); irmc->buffer = NULL; } -- 2.47.3