diff options
author | John (J5) Palmieri <johnp@redhat.com> | 2005-11-30 19:32:27 +0000 |
---|---|---|
committer | John (J5) Palmieri <johnp@redhat.com> | 2005-11-30 19:32:27 +0000 |
commit | 0ca96ec548a6e4a1e39429f3c0480adfe7e2eab8 (patch) | |
tree | 90cf95cc76cdd8e3242eb94e9ae7703b8fbd829d /glib | |
parent | 111118fd8a9240440ec0e4b9710bebf91e186881 (diff) |
* dbus/dbus-auth.c, dbus/dbus-connection.c, dbus/dbus-keyring.c,
dbus/dbus-server-debug-pipe.c, glib/dbus-binding-tool-glib.c
glib/dbus-glib-tool.c, glib/dbus-gparser.c, glib/dbus-gproxy.c
test/test-segfault.c, test/test-utils.c,
test/glib/test-dbus-glib.c, tools/dbus-cleanup-sockets.c
tools/dbus-launch.c, tools/dbus-tree-view.c, tools/dbus-viewer.c:
Various cleanup of dead code and compiler warnings (patch from
Kjartan Maraas <kmaraas at gnome.org>)
Diffstat (limited to 'glib')
-rw-r--r-- | glib/dbus-binding-tool-glib.c | 2 | ||||
-rw-r--r-- | glib/dbus-glib-tool.c | 4 | ||||
-rw-r--r-- | glib/dbus-gparser.c | 11 | ||||
-rw-r--r-- | glib/dbus-gproxy.c | 2 |
4 files changed, 2 insertions, 17 deletions
diff --git a/glib/dbus-binding-tool-glib.c b/glib/dbus-binding-tool-glib.c index 1d480975..fb361280 100644 --- a/glib/dbus-binding-tool-glib.c +++ b/glib/dbus-binding-tool-glib.c @@ -1423,7 +1423,6 @@ generate_client_glue (BaseInfo *base, DBusBindingToolCData *data, GError **error InterfaceInfo *interface; GSList *methods; GSList *tmp; - int count; char *iface_prefix; channel = data->channel; @@ -1431,7 +1430,6 @@ generate_client_glue (BaseInfo *base, DBusBindingToolCData *data, GError **error interface = (InterfaceInfo *) base; methods = interface_info_get_methods (interface); - count = 0; iface_prefix = iface_to_c_prefix (interface_info_get_name (interface)); diff --git a/glib/dbus-glib-tool.c b/glib/dbus-glib-tool.c index 228fbf81..2a8844d2 100644 --- a/glib/dbus-glib-tool.c +++ b/glib/dbus-glib-tool.c @@ -264,7 +264,6 @@ version (void) int main (int argc, char **argv) { - const char *prev_arg; const char *output_file; const char *prefix; char *output_file_tmp; @@ -291,7 +290,6 @@ main (int argc, char **argv) outputmode = DBUS_BINDING_OUTPUT_NONE; end_of_args = FALSE; files = NULL; - prev_arg = NULL; output_file = NULL; prefix = ""; ignore_unsupported = FALSE; @@ -353,8 +351,6 @@ main (int argc, char **argv) else files = g_slist_prepend (files, (char*) arg); - prev_arg = arg; - ++i; } diff --git a/glib/dbus-gparser.c b/glib/dbus-gparser.c index bf89492d..f296f961 100644 --- a/glib/dbus-gparser.c +++ b/glib/dbus-gparser.c @@ -144,6 +144,7 @@ locate_attributes (const char *element_name, return retval; } +#if 0 static gboolean check_no_attributes (const char *element_name, const char **attribute_names, @@ -162,6 +163,7 @@ check_no_attributes (const char *element_name, return TRUE; } +#endif struct Parser { @@ -367,7 +369,6 @@ parse_method (Parser *parser, { const char *name; MethodInfo *method; - NodeInfo *top; if (parser->interface == NULL || parser->node_stack == NULL || @@ -400,8 +401,6 @@ parse_method (Parser *parser, return FALSE; } - top = parser->node_stack->data; - method = method_info_new (name); interface_info_add_method (parser->interface, method); method_info_unref (method); @@ -420,7 +419,6 @@ parse_signal (Parser *parser, { const char *name; SignalInfo *signal; - NodeInfo *top; if (parser->interface == NULL || parser->node_stack == NULL || @@ -453,8 +451,6 @@ parse_signal (Parser *parser, return FALSE; } - top = parser->node_stack->data; - signal = signal_info_new (name); interface_info_add_signal (parser->interface, signal); signal_info_unref (signal); @@ -492,7 +488,6 @@ parse_property (Parser *parser, const char *access; const char *type; PropertyInfo *property; - NodeInfo *top; PropertyAccessFlags access_flags; if (parser->interface == NULL || @@ -565,8 +560,6 @@ parse_property (Parser *parser, return FALSE; } - top = parser->node_stack->data; - property = property_info_new (name, type, access_flags); interface_info_add_property (parser->interface, property); property_info_unref (property); diff --git a/glib/dbus-gproxy.c b/glib/dbus-gproxy.c index d9469d2f..aa7ae193 100644 --- a/glib/dbus-gproxy.c +++ b/glib/dbus-gproxy.c @@ -635,13 +635,11 @@ typedef struct static void unassociate_proxies (gpointer key, gpointer val, gpointer user_data) { - const char *tri; DBusGProxyList *list; const char *name; GSList *tmp; DBusGProxyUnassociateData *data; - tri = key; list = val; data = user_data; name = data->name; |