summaryrefslogtreecommitdiff
path: root/dbus/dbus-marshal-basic.c
diff options
context:
space:
mode:
authorRalf Habacker <ralf.habacker@freenet.de>2015-11-24 12:07:38 +0100
committerRalf Habacker <ralf.habacker@freenet.de>2015-11-24 12:26:00 +0100
commitd2b8b8611e0e707b113b25874d027966a34fee35 (patch)
treeb154a30dcf78e2771bc78cafcb29231058fe5c49 /dbus/dbus-marshal-basic.c
parent0ccafbd1730c2e994600b21ec57dd821f32e85a0 (diff)
downloaddbus-d2b8b8611e0e707b113b25874d027966a34fee35.tar.gz
Fix warning: "pointer targets in assignment differ in signedness [-Wpointer-sign]".
The warnings are fixed by adding functions to dbus string name space returning unsigned char pointer, which avoids the need to use casts. Bug: https://bugs.freedesktop.org/attachment.cgi?id=93069 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Diffstat (limited to 'dbus/dbus-marshal-basic.c')
-rw-r--r--dbus/dbus-marshal-basic.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/dbus/dbus-marshal-basic.c b/dbus/dbus-marshal-basic.c
index bd4f9681..a7a6d595 100644
--- a/dbus/dbus-marshal-basic.c
+++ b/dbus/dbus-marshal-basic.c
@@ -1610,7 +1610,9 @@ _dbus_marshal_test (void)
int pos, dump_pos;
unsigned char array1[5] = { 3, 4, 0, 1, 9 };
dbus_int16_t array2[3] = { 124, 457, 780 };
+ dbus_uint16_t array2u[3] = { 124, 457, 780 };
dbus_int32_t array4[3] = { 123, 456, 789 };
+ dbus_uint32_t array4u[3] = { 123, 456, 789 };
dbus_int64_t array8[3] = { DBUS_INT64_CONSTANT (0x123ffffffff),
DBUS_INT64_CONSTANT (0x456ffffffff),
DBUS_INT64_CONSTANT (0x789ffffffff) };
@@ -1707,13 +1709,13 @@ _dbus_marshal_test (void)
/* Arrays */
MARSHAL_TEST_FIXED_ARRAY (INT16, DBUS_BIG_ENDIAN, array2);
MARSHAL_TEST_FIXED_ARRAY (INT16, DBUS_LITTLE_ENDIAN, array2);
- MARSHAL_TEST_FIXED_ARRAY (UINT16, DBUS_BIG_ENDIAN, array2);
- MARSHAL_TEST_FIXED_ARRAY (UINT16, DBUS_LITTLE_ENDIAN, array2);
+ MARSHAL_TEST_FIXED_ARRAY (UINT16, DBUS_BIG_ENDIAN, array2u);
+ MARSHAL_TEST_FIXED_ARRAY (UINT16, DBUS_LITTLE_ENDIAN, array2u);
MARSHAL_TEST_FIXED_ARRAY (INT32, DBUS_BIG_ENDIAN, array4);
MARSHAL_TEST_FIXED_ARRAY (INT32, DBUS_LITTLE_ENDIAN, array4);
- MARSHAL_TEST_FIXED_ARRAY (UINT32, DBUS_BIG_ENDIAN, array4);
- MARSHAL_TEST_FIXED_ARRAY (UINT32, DBUS_LITTLE_ENDIAN, array4);
+ MARSHAL_TEST_FIXED_ARRAY (UINT32, DBUS_BIG_ENDIAN, array4u);
+ MARSHAL_TEST_FIXED_ARRAY (UINT32, DBUS_LITTLE_ENDIAN, array4u);
MARSHAL_TEST_FIXED_ARRAY (BYTE, DBUS_BIG_ENDIAN, array1);
MARSHAL_TEST_FIXED_ARRAY (BYTE, DBUS_LITTLE_ENDIAN, array1);