Attachment 49380 Details for Bug 39230 – [PATCH 3/3] update_desktop_file_entry: initialize return value properly, and actually return it

[patch] [PATCH 3/3] update_desktop_file_entry: initialize return value properly, and actually return it

0003-update_desktop_file_entry-initialize-return-value-pr.patch (text/plain), 1.07 KB, created by Simon McVittie on 2011-07-21 05:23:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-07-21 05:23:59 UTC

Size: 1.07 KB

patch

obsolete

>From f8c8eba177183f6a132857c051acb1aa9e87d83c Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Thu, 21 Jul 2011 13:21:29 +0100
>Subject: [PATCH 3/3] update_desktop_file_entry: initialize return value
> properly, and actually return it
>
>Since 1.4.4 (commit 75cfd97f) this function always returned FALSE. As far
>as I can see this was actually harmless, because both of its callers
>ignore any error that is not NoMemory (and treat it the same as success).
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39230
>---
> bus/activation.c |    3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
>diff --git a/bus/activation.c b/bus/activation.c
>index 8c9f559..acb2aa8 100644
>--- a/bus/activation.c
>+++ b/bus/activation.c
>@@ -268,6 +268,7 @@ update_desktop_file_entry (BusActivation       *activation,
> 
>   _DBUS_ASSERT_ERROR_IS_CLEAR (error);
> 
>+  retval = FALSE;
>   name = NULL;
>   exec = NULL;
>   user = NULL;
>@@ -478,7 +479,7 @@ out:
>   if (entry)
>     bus_activation_entry_unref (entry);
> 
>-  return FALSE;
>+  return retval;
> }
> 
> static dbus_bool_t
>-- 
>1.7.5.4
>

Actions: View | Splinter Review

Attachments on bug 39230: 49378 | 49379 | 49380

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.