fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-01-05 14:50:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

dbus-marshal-*-util: Remove all trailing whitespace

Browse source 
This is in preparation for moving the files: our commit hook would
object to the delete + add otherwise.

Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie 2018-12-17 11:34:41 +00:00
parent f1f5294276
commit 5424eb2b0d
3 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dbus/dbus-marshal-byteswap-util.c
View file

@ -41,7 +41,7 @@ do_byteswap_test (int byte_order)
_dbus_test_fatal ("oom");
opposite_order = byte_order == DBUS_LITTLE_ENDIAN ? DBUS_BIG_ENDIAN : DBUS_LITTLE_ENDIAN;
sequence = 0;
while (_dbus_test_generate_bodies (sequence, byte_order, &signature, &body))
{
@ -64,7 +64,7 @@ do_byteswap_test (int byte_order)
&body, 0);
_dbus_type_reader_init (&copy_reader, opposite_order, &signature, 0,
&copy, 0);
if (!_dbus_type_reader_equal_values (&body_reader, &copy_reader))
{
_dbus_verbose_bytes_of_string (&signature, 0,
@ -76,9 +76,9 @@ do_byteswap_test (int byte_order)
_dbus_test_fatal ("Byte-swapped data did not have same values as original data");
}
_dbus_string_free (&copy);
_dbus_string_set_length (&signature, 0);
_dbus_string_set_length (&body, 0);
++sequence;

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

@ -85,7 +85,7 @@ equal_values_helper (DBusTypeReader *lhs,
basic_value_zero (&lhs_value);
basic_value_zero (&rhs_value);
_dbus_type_reader_read_basic (lhs, &lhs_value);
_dbus_type_reader_read_basic (rhs, &rhs_value);
@ -1611,7 +1611,7 @@ build_body (TestTypeNode **nodes,
data_block_init_reader_writer (&block,
&reader, &writer);
/* DBusTypeWriter assumes it's writing into an existing signature,
* so doesn't add nul on its own. We have to do that.
*/
@ -1633,7 +1633,7 @@ build_body (TestTypeNode **nodes,
body, 0))
_dbus_test_fatal ("oom");
data_block_free (&block);
data_block_free (&block);
}
dbus_bool_t
@ -1652,7 +1652,7 @@ _dbus_test_generate_bodies (int sequence,
return FALSE;
n_nodes = 1;
build_body (nodes, n_nodes, byte_order, signature, body);
@ -1662,7 +1662,7 @@ _dbus_test_generate_bodies (int sequence,
node_destroy (nodes[i]);
++i;
}
return TRUE;
}
@ -2681,7 +2681,7 @@ object_path_from_seed (char *buf,
++i;
buf[i] = v;
++i;
v += 1;
}
}
@ -3304,7 +3304,7 @@ dict_write_value (TestTypeNode *node,
_dbus_string_free (&entry_value_signature);
return FALSE;
}
child = _dbus_list_get_first (&container->children);
if (!node_build_signature (child,
@ -3347,19 +3347,19 @@ dict_write_value (TestTypeNode *node,
DBUS_TYPE_INT32,
&key))
goto oom;
if (!node_write_value (child, block, &entry_sub, seed + i))
goto oom;
if (!_dbus_type_writer_unrecurse (&sub, &entry_sub))
goto oom;
++i;
}
if (!_dbus_type_writer_unrecurse (writer, &sub))
goto oom;
_dbus_string_free (&entry_value_signature);
_dbus_string_free (&dict_entry_signature);
return TRUE;
@ -3394,20 +3394,20 @@ dict_read_or_set_value (TestTypeNode *node,
_dbus_type_reader_recurse (reader, &sub);
check_expected_type (&sub, DBUS_TYPE_DICT_ENTRY);
i = 0;
while (i < n_entries)
{
DBusTypeReader entry_sub;
check_expected_type (&sub, DBUS_TYPE_DICT_ENTRY);
_dbus_type_reader_recurse (&sub, &entry_sub);
if (realign_root == NULL)
{
dbus_int32_t v;
check_expected_type (&entry_sub, DBUS_TYPE_INT32);
_dbus_type_reader_read_basic (&entry_sub, &v);
@ -3415,7 +3415,7 @@ dict_read_or_set_value (TestTypeNode *node,
_dbus_assert (v == (dbus_int32_t) uint32_from_seed (seed + i));
NEXT_EXPECTING_TRUE (&entry_sub);
if (!node_read_value (child, &entry_sub, seed + i))
return FALSE;
@ -3424,22 +3424,22 @@ dict_read_or_set_value (TestTypeNode *node,
else
{
dbus_int32_t v;
v = (dbus_int32_t) uint32_from_seed (seed + i);
if (!_dbus_type_reader_set_basic (&entry_sub,
&v,
realign_root))
return FALSE;
NEXT_EXPECTING_TRUE (&entry_sub);
if (!node_set_value (child, &entry_sub, realign_root, seed + i))
return FALSE;
NEXT_EXPECTING_FALSE (&entry_sub);
}
if (i == (n_entries - 1))
NEXT_EXPECTING_FALSE (&sub);
else
@ -3483,7 +3483,7 @@ dict_build_signature (TestTypeNode *node,
if (!_dbus_string_append (str, DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING DBUS_TYPE_INT32_AS_STRING))
goto oom;
if (!node_build_signature (_dbus_list_get_first (&container->children),
str))
goto oom;

6
dbus/dbus-marshal-validate-util.c
View file

@ -433,7 +433,7 @@ _dbus_marshal_validate_test (const char *test_data_dir _DBUS_GNUC_UNUSED)
_dbus_string_free (&str);
/* Body validation; test basic validation of valid bodies for both endian */
{
int sequence;
DBusString signature;
@ -465,7 +465,7 @@ _dbus_marshal_validate_test (const char *test_data_dir _DBUS_GNUC_UNUSED)
_dbus_string_set_length (&body, 0);
++sequence;
}
sequence = 0;
while (_dbus_test_generate_bodies (sequence, DBUS_BIG_ENDIAN,
&signature, &body))
@ -493,7 +493,7 @@ _dbus_marshal_validate_test (const char *test_data_dir _DBUS_GNUC_UNUSED)
_dbus_string_free (&signature);
_dbus_string_free (&body);
}
return TRUE;
}