From c7c4d95d0e1284e58a3dfd15c5dc7f0d7c6a5229 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 20 Aug 2004 15:28:50 +0000 Subject: 2004-08-20 Colin Walters * bus/config-parser.c (start_busconfig_child): Remove some unused variables. * bus/selinux.c (bus_selinux_id_table_insert): Avoid compiler warning. --- ChangeLog | 8 ++++++++ bus/config-parser.c | 3 --- bus/selinux.c | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7b0279c3..6f3cc2a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-08-20 Colin Walters + + * bus/config-parser.c (start_busconfig_child): Remove some unused + variables. + + * bus/selinux.c (bus_selinux_id_table_insert): Avoid compiler + warning. + 2004-08-17 Joe Shaw * configure.in: If --enable-mono is passed in, if we can't find diff --git a/bus/config-parser.c b/bus/config-parser.c index acf40228..73d99418 100644 --- a/bus/config-parser.c +++ b/bus/config-parser.c @@ -871,9 +871,6 @@ start_busconfig_child (BusConfigParser *parser, } else if (strcmp (element_name, "selinux") == 0) { - Element *e; - const char *name; - if (!check_no_attributes (parser, "selinux", attribute_names, attribute_values, error)) return FALSE; diff --git a/bus/selinux.c b/bus/selinux.c index 2477233b..49524624 100644 --- a/bus/selinux.c +++ b/bus/selinux.c @@ -424,7 +424,7 @@ bus_selinux_id_table_insert (DBusHashTable *service_table, if (key == NULL) return retval; - if (avc_context_to_sid (service_context, &sid) < 0) + if (avc_context_to_sid ((char *) service_context, &sid) < 0) { _dbus_assert (errno == ENOMEM); goto out; -- cgit