fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2025-12-25 22:10:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Marshalling tests: make integer generation more concise

Browse source 
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
This commit is contained in:
Thomas Zimmermann 2016-10-13 23:19:58 +01:00 • committed by Simon McVittie
parent fc02fb9627
commit a4c3b95731
1 changed files with 16 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
dbus/dbus-marshal-recursive-util.c
View file

@ -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 */