| Message ID | 20160728143808.13707-5-marcandre.lureau@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 07/28/2016 08:37 AM, marcandre.lureau@redhat.com wrote: > From: Marc-André Lureau <marcandre.lureau@redhat.com> > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > qga/guest-agent-command-state.c | 7 +++++++ > qga/guest-agent-core.h | 1 + > qga/main.c | 6 ++++++ > 3 files changed, 14 insertions(+) > > diff --git a/qga/guest-agent-command-state.c b/qga/guest-agent-command-state.c > index 4de229c..56e63b1 100644 > --- a/qga/guest-agent-command-state.c > +++ b/qga/guest-agent-command-state.c > @@ -71,3 +71,10 @@ GACommandState *ga_command_state_new(void) > cs->groups = NULL; > return cs; > } > + > +void ga_command_state_free(GACommandState *cs) > +{ > + g_slist_foreach(cs->groups, (GFunc)g_free, NULL); Here, the ugly cast is because we don't have a static forwarder function with the correct signature handy. Hmm, I wonder if it is worth adding a static inline forwarder function in one of our headers that ALL files can use, when they want to use a 2-arg callback that merely calls g_free() on its first argument and ignores the second, since we have now proved it is a commonly-used forwarder.
diff --git a/qga/guest-agent-command-state.c b/qga/guest-agent-command-state.c index 4de229c..56e63b1 100644 --- a/qga/guest-agent-command-state.c +++ b/qga/guest-agent-command-state.c @@ -71,3 +71,10 @@ GACommandState *ga_command_state_new(void) cs->groups = NULL; return cs; } + +void ga_command_state_free(GACommandState *cs) +{ + g_slist_foreach(cs->groups, (GFunc)g_free, NULL); + g_slist_free(cs->groups); + g_free(cs); +} diff --git a/qga/guest-agent-core.h b/qga/guest-agent-core.h index 0a49516..63e9d39 100644 --- a/qga/guest-agent-core.h +++ b/qga/guest-agent-core.h @@ -28,6 +28,7 @@ void ga_command_state_add(GACommandState *cs, void ga_command_state_init_all(GACommandState *cs); void ga_command_state_cleanup_all(GACommandState *cs); GACommandState *ga_command_state_new(void); +void ga_command_state_free(GACommandState *cs); bool ga_logging_enabled(GAState *s); void ga_disable_logging(GAState *s); void ga_enable_logging(GAState *s); diff --git a/qga/main.c b/qga/main.c index 67be90b..522a609 100644 --- a/qga/main.c +++ b/qga/main.c @@ -1372,6 +1372,8 @@ int main(int argc, char **argv) end: if (s->command_state) { ga_command_state_cleanup_all(s->command_state); + ga_command_state_free(s->command_state); + json_message_parser_destroy(&s->parser); } if (s->channel) { ga_channel_free(s->channel); @@ -1384,6 +1386,10 @@ end: } config_free(config); + if (s->main_loop) { + g_main_loop_unref(s->main_loop); + } + g_free(s); return ret; }