Attachment 91703 Details for Bug 73409 – [tpfs 5/8] TfCallContent: compile with -Werror=shadow

[patch] [tpfs 5/8] TfCallContent: compile with -Werror=shadow

0005-TfCallContent-compile-with-Werror-shadow.patch (text/plain), 2.35 KB, created by Simon McVittie on 2014-01-08 20:39:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2014-01-08 20:39:49 UTC

Size: 2.35 KB

patch

obsolete

>From 328bed700033ee3462e5dca615c1bffcc5218670 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Wed, 8 Jan 2014 19:43:18 +0000
>Subject: [PATCH 5/8] TfCallContent: compile with -Werror=shadow
>
>tp_asv_get_boolean() is documented to return FALSE in the "not valid"
>case, so there's no need to check it separately here. This avoids
>shadowing a variable named valid at function scope.
>
>j was previously named i, shadowing another i at function scope.
>---
> telepathy-farstream/call-content.c | 10 +++-------
> 1 file changed, 3 insertions(+), 7 deletions(-)
>
>diff --git a/telepathy-farstream/call-content.c b/telepathy-farstream/call-content.c
>index dff173f..db1e3c6 100644
>--- a/telepathy-farstream/call-content.c
>+++ b/telepathy-farstream/call-content.c
>@@ -865,16 +865,12 @@ process_media_description (TfCallContent *self,
>       if (!strcmp (interfaces[i],
>               TP_IFACE_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK1))
>         {
>-          gboolean valid;
>-
>           self->current_has_rtcp_fb = TRUE;
>           rtcp_fb = tp_asv_get_boxed (properties,
>               TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK1_FEEDBACK_MESSAGES,
>               TP_HASH_TYPE_RTCP_FEEDBACK_MESSAGE_MAP);
>           does_avpf = tp_asv_get_boolean (properties,
>-              TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK1_DOES_AVPF, &valid);
>-          if (!valid)
>-            does_avpf = FALSE;
>+              TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK1_DOES_AVPF, NULL);
>         }
>       else if (!strcmp (interfaces[i],
>               TP_IFACE_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS1))
>@@ -2157,7 +2153,7 @@ tf_call_content_bus_message (TfCallContent *content,
>           &codec, &secondary_codecs))
>     {
>       gchar *tmp;
>-      guint i = 1;
>+      guint j = 1;
> 
>       tmp = fs_codec_to_string (codec);
>       g_debug ("Send codec changed: %s", tmp);
>@@ -2166,7 +2162,7 @@ tf_call_content_bus_message (TfCallContent *content,
>       while (secondary_codecs)
>         {
>           tmp = fs_codec_to_string (secondary_codecs->data);
>-          g_debug ("Secondary send codec %u changed: %s", i++, tmp);
>+          g_debug ("Secondary send codec %u changed: %s", j++, tmp);
>           g_free (tmp);
>           secondary_codecs = secondary_codecs->next;
>         }
>-- 
>1.8.5.2
>

Actions: View | Splinter Review

Attachments on bug 73409: 91698 | 91699 | 91700 | 91701 | 91702 | 91703 | 91704 | 91705

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.