Attachment 130427 Details for Bug 98191 – [4] dbus-spawn: assert impossible returns from read functions don't happen

[patch] [4] dbus-spawn: assert impossible returns from read functions don't happen

0004-dbus-spawn-assert-impossible-returns-from-read-funct.patch (text/plain), 1.44 KB, created by Simon McVittie on 2017-03-24 19:43:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2017-03-24 19:43:01 UTC

Size: 1.44 KB

patch

obsolete

>From ce716d1dbec5d6afb38f57fafa80c3e21194be4b Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 17 Jan 2017 20:28:15 +0000
>Subject: [PATCH 04/16] dbus-spawn: assert impossible returns from read
> functions don't happen
>
>This silences -Wswitch-default.
>
>Based on a patch from Thomas Zimmermann.
>
>Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
>---
> dbus/dbus-spawn.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
>diff --git a/dbus/dbus-spawn.c b/dbus/dbus-spawn.c
>index 655bfe92..3c721d6f 100644
>--- a/dbus/dbus-spawn.c
>+++ b/dbus/dbus-spawn.c
>@@ -429,6 +429,10 @@ read_data (DBusBabysitter *sitter,
> 
>     case READ_STATUS_OK:
>       break;
>+
>+    default:
>+      _dbus_assert_not_reached ("invalid ReadStatus");
>+      break;
>     }
>   
>   if (got == 1)
>@@ -453,6 +457,9 @@ read_data (DBusBabysitter *sitter,
>                 return r;
>               case READ_STATUS_OK:
>                 break;
>+              default:
>+                _dbus_assert_not_reached ("invalid ReadStatus");
>+                break;
>               }
>             
>             if (got == 1)
>@@ -513,6 +520,9 @@ read_data (DBusBabysitter *sitter,
>                 return r;
>               case READ_STATUS_OK:
>                 break;
>+              default:
>+                _dbus_assert_not_reached ("invalid ReadStatus");
>+                break;
>               }
>             
>             sitter->grandchild_pid = pid;
>-- 
>2.11.0
>

Actions: View | Splinter Review

Attachments on bug 98191: 127281 | 127282 | 127283 | 127284 | 127285 | 127286 | 129005 | 130424 | 130425 | 130426 | 130427 | 130428 | 130429 | 130430 | 130431 | 130432 | 130433 | 130434 | 130435 | 130436 | 130437 | 130438 | 130439 | 130442 | 130743

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.