[grilo] core: Initialize variable
- From: Juan A. Suarez Romero <jasuarez src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [grilo] core: Initialize variable
- Date: Tue, 8 Mar 2011 08:21:40 +0000 (UTC)
commit ea1183d30fb738e1a2a6696e025f3ee05687348c
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date: Tue Mar 8 09:20:31 2011 +0100
core: Initialize variable
Initialize a boolean variable that avoids to free wrongly a GError.
Signed-off-by: Juan A. Suarez Romero <jasuarez igalia com>
src/grl-media-source.c | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/src/grl-media-source.c b/src/grl-media-source.c
index 1e6d3e6..f32346c 100644
--- a/src/grl-media-source.c
+++ b/src/grl-media-source.c
@@ -1119,20 +1119,20 @@ full_resolution_done_cb (GrlMetadataSource *source,
was cancelled and this is the one with remaining == 0*/
if (GPOINTER_TO_UINT (ctl_info->next_index->data) == cb_info->remaining
|| cancelled) {
- GError *_error = (GError *)error;
- gboolean should_free_error;
+ GError *_error = (GError *)error;
+ gboolean should_free_error = FALSE;
/* Notice we pass NULL as error on purpose
since the result is valid even if the full-resolution failed */
guint remaining = cb_info->remaining;
- if (cancelled && remaining==0
- && !g_error_matches (_error, GRL_CORE_ERROR,
- GRL_CORE_ERROR_OPERATION_CANCELLED)) {
- /* We are cancelled and this is the last callback, cancelled error need to
- * be set */
- _error = g_error_new (GRL_CORE_ERROR, GRL_CORE_ERROR_OPERATION_CANCELLED,
- "Operation was cancelled");
- should_free_error = TRUE;
- }
+ if (cancelled && remaining==0
+ && !g_error_matches (_error, GRL_CORE_ERROR,
+ GRL_CORE_ERROR_OPERATION_CANCELLED)) {
+ /* We are cancelled and this is the last callback, cancelled error need to
+ * be set */
+ _error = g_error_new (GRL_CORE_ERROR, GRL_CORE_ERROR_OPERATION_CANCELLED,
+ "Operation was cancelled");
+ should_free_error = TRUE;
+ }
GRL_DEBUG (" Result is in sort order, emitting (%d)", remaining);
ctl_info->user_callback (cb_info->source,
cb_info->browse_id,
@@ -1140,8 +1140,8 @@ full_resolution_done_cb (GrlMetadataSource *source,
cb_info->remaining,
ctl_info->user_data,
_error);
- if (should_free_error && _error)
- g_error_free (_error);
+ if (should_free_error && _error)
+ g_error_free (_error);
ctl_info->next_index = g_list_delete_link (ctl_info->next_index,
ctl_info->next_index);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]