dbus/glib dbus-binding-tool-glib.c, 1.22, 1.23 dbus-glib-tool.c,
1.15, 1.16 dbus-gparser.c, 1.19, 1.20 dbus-gproxy.c, 1.42, 1.43
John Palmieri
johnp at freedesktop.org
Wed Nov 30 11:32:29 PST 2005
Update of /cvs/dbus/dbus/glib
In directory gabe:/tmp/cvs-serv31793/glib
Modified Files:
dbus-binding-tool-glib.c dbus-glib-tool.c dbus-gparser.c
dbus-gproxy.c
Log Message:
* 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>)
Index: dbus-binding-tool-glib.c
===================================================================
RCS file: /cvs/dbus/dbus/glib/dbus-binding-tool-glib.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- dbus-binding-tool-glib.c 25 Oct 2005 08:54:57 -0000 1.22
+++ dbus-binding-tool-glib.c 30 Nov 2005 19:32:26 -0000 1.23
@@ -1423,7 +1423,6 @@
InterfaceInfo *interface;
GSList *methods;
GSList *tmp;
- int count;
char *iface_prefix;
channel = data->channel;
@@ -1431,7 +1430,6 @@
interface = (InterfaceInfo *) base;
methods = interface_info_get_methods (interface);
- count = 0;
iface_prefix = iface_to_c_prefix (interface_info_get_name (interface));
Index: dbus-glib-tool.c
===================================================================
RCS file: /cvs/dbus/dbus/glib/dbus-glib-tool.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- dbus-glib-tool.c 26 Sep 2005 22:26:38 -0000 1.15
+++ dbus-glib-tool.c 30 Nov 2005 19:32:26 -0000 1.16
@@ -264,7 +264,6 @@
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 @@
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 @@
else
files = g_slist_prepend (files, (char*) arg);
- prev_arg = arg;
-
++i;
}
Index: dbus-gparser.c
===================================================================
RCS file: /cvs/dbus/dbus/glib/dbus-gparser.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- dbus-gparser.c 9 Jul 2005 18:54:45 -0000 1.19
+++ dbus-gparser.c 30 Nov 2005 19:32:26 -0000 1.20
@@ -144,6 +144,7 @@
return retval;
}
+#if 0
static gboolean
check_no_attributes (const char *element_name,
const char **attribute_names,
@@ -162,6 +163,7 @@
return TRUE;
}
+#endif
struct Parser
{
@@ -367,7 +369,6 @@
{
const char *name;
MethodInfo *method;
- NodeInfo *top;
if (parser->interface == NULL ||
parser->node_stack == NULL ||
@@ -400,8 +401,6 @@
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 @@
{
const char *name;
SignalInfo *signal;
- NodeInfo *top;
if (parser->interface == NULL ||
parser->node_stack == NULL ||
@@ -453,8 +451,6 @@
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 @@
const char *access;
const char *type;
PropertyInfo *property;
- NodeInfo *top;
PropertyAccessFlags access_flags;
if (parser->interface == NULL ||
@@ -565,8 +560,6 @@
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);
Index: dbus-gproxy.c
===================================================================
RCS file: /cvs/dbus/dbus/glib/dbus-gproxy.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- dbus-gproxy.c 26 Aug 2005 02:00:37 -0000 1.42
+++ dbus-gproxy.c 30 Nov 2005 19:32:26 -0000 1.43
@@ -635,13 +635,11 @@
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;
More information about the dbus-commit
mailing list