From 988958f40a2e0575df3d4d48101612713737a5db Mon Sep 17 00:00:00 2001 From: Jose Bollo Date: Wed, 29 May 2019 16:32:50 +0200 Subject: Fix gcc 8 warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Compiling with -Werror isn't possible without adaptation of the code. Signed-off-by: José Bollo diff --git a/bus/config-parser-trivial.c b/bus/config-parser-trivial.c index dd65c6d..23dedb4 100644 --- a/bus/config-parser-trivial.c +++ b/bus/config-parser-trivial.c @@ -194,6 +194,7 @@ bus_config_parser_start_element (BusConfigParser *parser, case ELEMENT_POLICY: case ELEMENT_LIMIT: case ELEMENT_ALLOW: + case ELEMENT_CHECK: case ELEMENT_DENY: case ELEMENT_FORK: case ELEMENT_PIDFILE: @@ -316,6 +317,7 @@ bus_config_parser_content (BusConfigParser *parser, case ELEMENT_POLICY: case ELEMENT_LIMIT: case ELEMENT_ALLOW: + case ELEMENT_CHECK: case ELEMENT_DENY: case ELEMENT_FORK: case ELEMENT_PIDFILE: diff --git a/bus/config-parser.c b/bus/config-parser.c index b5f1dd1..7f91469 100644 --- a/bus/config-parser.c +++ b/bus/config-parser.c @@ -3408,6 +3408,7 @@ elements_equal (const Element *a, case ELEMENT_LISTEN: case ELEMENT_AUTH: case ELEMENT_ALLOW: + case ELEMENT_CHECK: case ELEMENT_DENY: case ELEMENT_FORK: case ELEMENT_PIDFILE: diff --git a/bus/desktop-file.c b/bus/desktop-file.c index 4459858..4a27ee3 100644 --- a/bus/desktop-file.c +++ b/bus/desktop-file.c @@ -382,7 +382,7 @@ is_valid_section_name (const char *name) while (*name) { - if (!((*name >= 'A' && *name <= 'Z') || (*name >= 'a' || *name <= 'z') || + if (!((*name >= ' ' && *name <= '~' && *name != '[' && *name != ']') || *name == '\n' || *name == '\t')) return FALSE; diff --git a/bus/driver.h b/bus/driver.h index 183c28b..05e9886 100644 --- a/bus/driver.h +++ b/bus/driver.h @@ -66,5 +66,7 @@ dbus_bool_t bus_driver_send_ack_reply (DBusConnection *connection, BusTransaction *transaction, DBusMessage *message, DBusError *error); +dbus_bool_t bus_driver_check_message_is_for_us (DBusMessage *message, + DBusError *error); #endif /* BUS_DRIVER_H */ diff --git a/bus/policy.c b/bus/policy.c index 27b66d1..c4c3d4b 100644 --- a/bus/policy.c +++ b/bus/policy.c @@ -1098,6 +1098,7 @@ bus_client_policy_check_can_send (DBusConnection *sender, case BUS_POLICY_RULE_ACCESS_ALLOW: result = BUS_RESULT_TRUE; break; + default: case BUS_POLICY_RULE_ACCESS_DENY: result = BUS_RESULT_FALSE; break; @@ -1350,6 +1351,7 @@ bus_client_policy_check_can_receive (BusClientPolicy *policy, case BUS_POLICY_RULE_ACCESS_ALLOW: result = BUS_RESULT_TRUE; break; + default: case BUS_POLICY_RULE_ACCESS_DENY: result = BUS_RESULT_FALSE; break; @@ -1443,6 +1445,7 @@ bus_rules_check_can_own (DBusList *rules, case BUS_POLICY_RULE_ACCESS_ALLOW: result = BUS_RESULT_TRUE; break; + default: case BUS_POLICY_RULE_ACCESS_DENY: result = BUS_RESULT_FALSE; break; diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c index 565e089..b96c735 100644 --- a/dbus/dbus-sysdeps-unix.c +++ b/dbus/dbus-sysdeps-unix.c @@ -4364,7 +4364,11 @@ _dbus_daemon_unpublish_session_bus_address (void) dbus_bool_t _dbus_get_is_errno_eagain_or_ewouldblock (int e) { +#if EAGAIN != EWOULDBLOCK return e == EAGAIN || e == EWOULDBLOCK; +#else + return e == EAGAIN; +#endif } /** diff --git a/tools/dbus-send.c b/tools/dbus-send.c index 6fb65fe..d853b39 100644 --- a/tools/dbus-send.c +++ b/tools/dbus-send.c @@ -293,10 +293,12 @@ main (int argc, char *argv[]) { is_bus = TRUE; } +#if 0 else if (arg[2] == 'p') /* peer */ { is_bus = FALSE; } +#endif else /* address; keeping backwards compatibility */ { is_bus = FALSE; -- 2.17.2