2010-11-11 20:46:19

by Dmitriy Paliy

Subject: [PATCH 1/2] g_string_free shell be used in IRMC

g_string_free instead of string_free shell 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.
---
plugins/irmc.c | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/plugins/irmc.c b/plugins/irmc.c
index 28c5e50..f7ad33b 100644
--- a/plugins/irmc.c
+++ b/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;
}

--
1.7.0.4

2010-11-11 21:23:37

by Johan Hedberg

Subject: Re: [PATCH 2/2] string_free is specific to filesystem only

Hi Dmitriy,

On Thu, Nov 11, 2010, Dmitriy Paliy wrote:
> string_free is a callback function specific to filesystem plugin only.
> It is used by OBEX drivers when closing OBEX object and not API
> exposed to other plugins. g_string_free can be used instead of it when
> required.
> ---
> plugins/filesystem.c | 2 +-
> plugins/filesystem.h | 1 -
> 2 files changed, 1 insertions(+), 2 deletions(-)

Also pushed upstream after similar fixes as with the first patch.

Johan

2010-11-11 21:23:03

by Johan Hedberg

Subject: Re: [PATCH 1/2] g_string_free shell be used in IRMC

Hi Dmitriy,

On Thu, Nov 11, 2010, Dmitriy Paliy wrote:
> g_string_free instead of string_free shell 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.
> ---
> plugins/irmc.c | 10 ++++------
> 1 files changed, 4 insertions(+), 6 deletions(-)

Thanks, pushed upstream after I fixed your email address (should be
@nokia.com, check your gitconfig) and summary line (which should start
with Add/Fix/Make/Use etc to be consistent with the rest of the commit
history.

Johan

2010-11-11 20:46:20

by Dmitriy Paliy

Subject: [PATCH 2/2] string_free is specific to filesystem only

string_free is a callback function specific to filesystem plugin only.
It is used by OBEX drivers when closing OBEX object and not API
exposed to other plugins. g_string_free can be used instead of it when
required.
---
plugins/filesystem.c | 2 +-
plugins/filesystem.h | 1 -
2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/plugins/filesystem.c b/plugins/filesystem.c
index bf00ac2..bb758ab 100644
--- a/plugins/filesystem.c
+++ b/plugins/filesystem.c
@@ -474,7 +474,7 @@ static void *pcsuite_open(const char *name, int oflag, mode_t mode,
return append_listing(object, name, TRUE, size, err);
}

-int string_free(void *object)
+static int string_free(void *object)
{
GString *string = object;

diff --git a/plugins/filesystem.h b/plugins/filesystem.h
index 712653f..9c7ad9a 100644
--- a/plugins/filesystem.h
+++ b/plugins/filesystem.h
@@ -21,5 +21,4 @@
*
*/

-int string_free(void *object);
ssize_t string_read(void *object, void *buf, size_t count);
--
1.7.0.4