Attachment 127285 Details for Bug 98191 – Marshalling tests: make integer generation more concise

[patch] Marshalling tests: make integer generation more concise

0005-Marshalling-tests-make-integer-generation-more-conci.patch (text/plain), 2.34 KB, created by Simon McVittie on 2016-10-13 22:24:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2016-10-13 22:24:24 UTC

Size: 2.34 KB

patch

obsolete

>From 5df4c9510e559dfb6bd14a920a95903515fcce41 Mon Sep 17 00:00:00 2001
>From: Thomas Zimmermann <tdz@users.sourceforge.net>
>Date: Thu, 13 Oct 2016 23:19:58 +0100
>Subject: [PATCH 5/6] Marshalling tests: make integer generation more concise
>
>This also avoids -Wswitch-default warnings.
>
>[smcv: split out from a larger commit]
>Reviewed-by: Simon McVittie <smcv@debian.org>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=98191
>---
> dbus/dbus-marshal-recursive-util.c | 56 +++++++++++---------------------------
> 1 file changed, 16 insertions(+), 40 deletions(-)
>
>diff --git a/dbus/dbus-marshal-recursive-util.c b/dbus/dbus-marshal-recursive-util.c
>index 7c5bb5c..d43972f 100644
>--- a/dbus/dbus-marshal-recursive-util.c
>+++ b/dbus/dbus-marshal-recursive-util.c
>@@ -2070,27 +2070,15 @@ int16_from_seed (int seed)
>    * just use seed itself, but that would only ever touch one byte of
>    * the int so would miss some kinds of bug.
>    */
>-  dbus_int16_t v;
>+  static const dbus_int16_t v_of_seed[5] = {
>+    SAMPLE_INT16,
>+    SAMPLE_INT16_ALTERNATE,
>+    -1,
>+    _DBUS_INT16_MAX,
>+    1
>+  };
> 
>-  v = 42; /* just to quiet compiler afaik */
>-  switch (seed % 5)
>-    {
>-    case 0:
>-      v = SAMPLE_INT16;
>-      break;
>-    case 1:
>-      v = SAMPLE_INT16_ALTERNATE;
>-      break;
>-    case 2:
>-      v = -1;
>-      break;
>-    case 3:
>-      v = _DBUS_INT16_MAX;
>-      break;
>-    case 4:
>-      v = 1;
>-      break;
>-    }
>+  dbus_int16_t v = v_of_seed[seed % _DBUS_N_ELEMENTS(v_of_seed)];
> 
>   if (seed > 1)
>     v *= seed; /* wraps around eventually, which is fine */
>@@ -2207,27 +2195,15 @@ int32_from_seed (int seed)
>    * just use seed itself, but that would only ever touch one byte of
>    * the int so would miss some kinds of bug.
>    */
>-  dbus_int32_t v;
>+  static const dbus_int32_t v_of_seed[5] = {
>+    SAMPLE_INT32,
>+    SAMPLE_INT32_ALTERNATE,
>+    -1,
>+    _DBUS_INT_MAX,
>+    1
>+  };
> 
>-  v = 42; /* just to quiet compiler afaik */
>-  switch (seed % 5)
>-    {
>-    case 0:
>-      v = SAMPLE_INT32;
>-      break;
>-    case 1:
>-      v = SAMPLE_INT32_ALTERNATE;
>-      break;
>-    case 2:
>-      v = -1;
>-      break;
>-    case 3:
>-      v = _DBUS_INT_MAX;
>-      break;
>-    case 4:
>-      v = 1;
>-      break;
>-    }
>+  dbus_int32_t v = v_of_seed[seed % _DBUS_N_ELEMENTS(v_of_seed)];
> 
>   if (seed > 1)
>     v *= seed; /* wraps around eventually, which is fine */
>-- 
>2.9.3
>

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.