2004-08-20 Colin Walters <walters@redhat.com>

	* bus/config-parser.c (start_busconfig_child): Remove some unused
	variables.

	* bus/selinux.c (bus_selinux_id_table_insert): Avoid compiler
	warning.

diff --git a/ChangeLog b/ChangeLog
index 7b0279c..6f3cc2a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-08-20  Colin Walters  <walters@redhat.com>
+
+       * 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  <joeshaw@novell.com>
 
        * 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 acf4022..73d9941 100644 (file)
--- 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 2477233..4952462 100644 (file)
--- 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;