diff options
| author | Simon McVittie <smcv@collabora.com> | 2017-09-25 16:19:39 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2017-09-25 16:59:23 +0100 |
| commit | 7b623b65c65d979a6a2c4d2e0efcfaf7f045f6cc (patch) | |
| tree | 545e013e4620b92c2c539e43bd19c883b30836fb | |
| parent | e3d15a0d578ae34a09b161b12e603ef1a58e2f68 (diff) | |
dbus-send: Reassure the compiler that secondary_type is initialized
It's initialized to a non-trivial value whenever container_type
is DBUS_TYPE_DICT_ENTRY, and subsequently only used if
container_type is DBUS_TYPE_DICT_ENTRY, but Debian's gcc 7.2.0-7
doesn't seem to be able to infer that any more, causing build failure
under -Werror=maybe-uninitialized.
Signed-off-by: Simon McVittie <smcv@collabora.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=102979
Reviewed-by: Philip Withnall <withnall@endlessm.com>
| -rw-r--r-- | tools/dbus-send.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/dbus-send.c b/tools/dbus-send.c index 0dc1f5b3..235e58e5 100644 --- a/tools/dbus-send.c +++ b/tools/dbus-send.c @@ -464,6 +464,7 @@ main (int argc, char *argv[]) DBusMessageIter container_iter; type = DBUS_TYPE_INVALID; + secondary_type = DBUS_TYPE_INVALID; arg = argv[i++]; c = strchr (arg, ':'); @@ -544,6 +545,7 @@ main (int argc, char *argv[]) } else if (container_type == DBUS_TYPE_DICT_ENTRY) { + _dbus_assert (secondary_type != DBUS_TYPE_INVALID); append_dict (target_iter, type, secondary_type, c); } else |