diff options
author | Milan Crha <mcrha@redhat.com> | 2013-11-15 16:06:57 +0800 |
---|---|---|
committer | Milan Crha <mcrha@redhat.com> | 2013-11-15 16:06:57 +0800 |
commit | 570c6374806d0f1ec59cf7a72543efe6b5b637be (patch) | |
tree | c5390b1fcb73f30c28bf37168add9bf1dc622b42 /modules | |
parent | 1be51f232560f864ba8795a38e55d472b5b0e2b3 (diff) | |
download | gsoc2013-evolution-570c6374806d0f1ec59cf7a72543efe6b5b637be.tar gsoc2013-evolution-570c6374806d0f1ec59cf7a72543efe6b5b637be.tar.gz gsoc2013-evolution-570c6374806d0f1ec59cf7a72543efe6b5b637be.tar.bz2 gsoc2013-evolution-570c6374806d0f1ec59cf7a72543efe6b5b637be.tar.lz gsoc2013-evolution-570c6374806d0f1ec59cf7a72543efe6b5b637be.tar.xz gsoc2013-evolution-570c6374806d0f1ec59cf7a72543efe6b5b637be.tar.zst gsoc2013-evolution-570c6374806d0f1ec59cf7a72543efe6b5b637be.zip |
Fix/mute issues found by Coverity scan
This makes the code free of Coverity scan issues.
It is sometimes quite pedantic and expects/suggests some
coding habits, thus certain changes may look weird, but for a good
thing, I hope. The code is also tagged with Coverity scan
suppressions, to keep the code as is and hide the warning too.
Also note that Coverity treats g_return_if_fail(), g_assert() and
similar macros as unreliable, and it's true these can be disabled
during the compile time, thus it brings in other set of 'weird'
changes.
Diffstat (limited to 'modules')
-rw-r--r-- | modules/backup-restore/evolution-backup-tool.c | 2 | ||||
-rw-r--r-- | modules/calendar/e-task-shell-view-private.c | 2 | ||||
-rw-r--r-- | modules/itip-formatter/e-mail-part-itip.c | 8 | ||||
-rw-r--r-- | modules/itip-formatter/itip-view.c | 17 | ||||
-rw-r--r-- | modules/mail-config/e-mail-config-google-summary.c | 2 | ||||
-rw-r--r-- | modules/mail-config/e-mail-config-yahoo-summary.c | 2 | ||||
-rw-r--r-- | modules/mail/e-mail-shell-view-private.c | 3 |
7 files changed, 17 insertions, 19 deletions
diff --git a/modules/backup-restore/evolution-backup-tool.c b/modules/backup-restore/evolution-backup-tool.c index 3ca07ecea2..d164d8b216 100644 --- a/modules/backup-restore/evolution-backup-tool.c +++ b/modules/backup-restore/evolution-backup-tool.c @@ -98,7 +98,7 @@ static GOptionEntry options[] = { #define d(x) #define print_and_run(x) \ - G_STMT_START { g_message ("%s", x); system (x); } G_STMT_END + G_STMT_START { g_message ("%s", x); if (system (x) == -1) g_warning ("%s: Failed to execute '%s'", G_STRFUNC, (x)); } G_STMT_END static gboolean check (const gchar *filename, gboolean *is_new_format); diff --git a/modules/calendar/e-task-shell-view-private.c b/modules/calendar/e-task-shell-view-private.c index 39b90b51a7..bacb46be62 100644 --- a/modules/calendar/e-task-shell-view-private.c +++ b/modules/calendar/e-task-shell-view-private.c @@ -518,7 +518,7 @@ e_task_shell_view_private_dispose (ETaskShellView *task_shell_view) g_signal_handler_disconnect ( priv->settings, priv->settings_hide_completed_tasks_value_handler_id); - priv->settings_hide_completed_tasks_units_handler_id = 0; + priv->settings_hide_completed_tasks_value_handler_id = 0; } g_clear_object (&priv->task_shell_backend); diff --git a/modules/itip-formatter/e-mail-part-itip.c b/modules/itip-formatter/e-mail-part-itip.c index e4e6302822..447ff0d13b 100644 --- a/modules/itip-formatter/e-mail-part-itip.c +++ b/modules/itip-formatter/e-mail-part-itip.c @@ -88,16 +88,14 @@ mail_part_itip_bind_dom_element (EMailPart *part, if (!WEBKIT_DOM_IS_HTML_IFRAME_ELEMENT (element)) { WebKitDOMNodeList *nodes; - guint ii, length; + guint length; nodes = webkit_dom_element_get_elements_by_tag_name ( element, "iframe"); length = webkit_dom_node_list_get_length (nodes); - for (ii = 0; ii < length; ii++) { + if (length > 0) element = WEBKIT_DOM_ELEMENT ( - webkit_dom_node_list_item (nodes, ii)); - break; - } + webkit_dom_node_list_item (nodes, 0)); } g_return_if_fail (WEBKIT_DOM_IS_HTML_IFRAME_ELEMENT (element)); diff --git a/modules/itip-formatter/itip-view.c b/modules/itip-formatter/itip-view.c index 1c193a4844..a490927501 100644 --- a/modules/itip-formatter/itip-view.c +++ b/modules/itip-formatter/itip-view.c @@ -4483,6 +4483,7 @@ get_uri_for_part (CamelMimePart *mime_part) /* Loading should be instantaneous since we already have * the full content, but we still have to crank the main * loop until the callback gets triggered. */ + /* coverity[loop_condition] */ while (!status.done) gtk_main_iteration (); @@ -4495,6 +4496,7 @@ get_uri_for_part (CamelMimePart *mime_part) /* We can't return until we have results, so crank * the main loop until the callback gets triggered. */ + /* coverity[loop_condition] */ while (!status.done) gtk_main_iteration (); @@ -6004,6 +6006,7 @@ itip_view_init_view (ItipView *view) case ICAL_METHOD_REQUEST: /* FIXME What about the name? */ itip_view_set_delegator (view, info->delegator_name ? info->delegator_name : info->delegator_address); + /* coverity[fallthrough] */ case ICAL_METHOD_PUBLISH: case ICAL_METHOD_ADD: case ICAL_METHOD_CANCEL: @@ -6019,13 +6022,13 @@ itip_view_init_view (ItipView *view) itip_view_set_organizer_sentby ( view, itip_strip_mailto (organizer.sentby)); - if (info->my_address) { - if (!(organizer.value && !g_ascii_strcasecmp (itip_strip_mailto (organizer.value), info->my_address)) - && !(organizer.sentby && !g_ascii_strcasecmp (itip_strip_mailto (organizer.sentby), info->my_address)) - && (info->to_address && g_ascii_strcasecmp (info->to_address, info->my_address))) - itip_view_set_proxy (view, info->to_name ? info->to_name : info->to_address); - } - break; + if (info->my_address) { + if (!(organizer.value && !g_ascii_strcasecmp (itip_strip_mailto (organizer.value), info->my_address)) + && !(organizer.sentby && !g_ascii_strcasecmp (itip_strip_mailto (organizer.sentby), info->my_address)) + && (info->to_address && g_ascii_strcasecmp (info->to_address, info->my_address))) + itip_view_set_proxy (view, info->to_name ? info->to_name : info->to_address); + } + break; case ICAL_METHOD_REPLY: case ICAL_METHOD_REFRESH: case ICAL_METHOD_COUNTER: diff --git a/modules/mail-config/e-mail-config-google-summary.c b/modules/mail-config/e-mail-config-google-summary.c index d1d51a4232..1517849ff8 100644 --- a/modules/mail-config/e-mail-config-google-summary.c +++ b/modules/mail-config/e-mail-config-google-summary.c @@ -240,7 +240,7 @@ mail_config_google_summary_constructed (GObject *object) widget = gtk_grid_new (); gtk_grid_set_row_spacing (GTK_GRID (widget), 6); gtk_grid_set_column_spacing (GTK_GRID (widget), 6); - gtk_box_pack_start (GTK_BOX (page), widget, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); g_object_bind_property ( extension, "applicable", diff --git a/modules/mail-config/e-mail-config-yahoo-summary.c b/modules/mail-config/e-mail-config-yahoo-summary.c index 2153f9cadf..0d6ea35b0a 100644 --- a/modules/mail-config/e-mail-config-yahoo-summary.c +++ b/modules/mail-config/e-mail-config-yahoo-summary.c @@ -235,7 +235,7 @@ mail_config_yahoo_summary_constructed (GObject *object) widget = gtk_grid_new (); gtk_grid_set_row_spacing (GTK_GRID (widget), 6); gtk_grid_set_column_spacing (GTK_GRID (widget), 6); - gtk_box_pack_start (GTK_BOX (page), widget, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); g_object_bind_property ( extension, "applicable", diff --git a/modules/mail/e-mail-shell-view-private.c b/modules/mail/e-mail-shell-view-private.c index bb97910b26..c367f683c4 100644 --- a/modules/mail/e-mail-shell-view-private.c +++ b/modules/mail/e-mail-shell-view-private.c @@ -178,9 +178,6 @@ ctrl: goto exit; } - /* All branches jump past this. */ - g_return_val_if_reached (FALSE); - emit: /* Forward the key press to the EMailReader interface. */ g_signal_emit_by_name (mail_view, "key-press-event", event, &handled); |