fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-02 18:58:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove more never-used variables

Browse source
This commit is contained in:
Simon McVittie 2011-08-05 13:20:16 +01:00
parent 775f77c719
commit bf2a1b169f
5 changed files with 2 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bus/test.c
View file

@ -40,8 +40,6 @@ static dbus_bool_t
add_client_watch (DBusWatch *watch,
void *data)
{
DBusConnection *connection = data;
return _dbus_loop_add_watch (client_loop, watch);
}
@ -49,8 +47,6 @@ static void
remove_client_watch (DBusWatch *watch,
void *data)
{
DBusConnection *connection = data;
_dbus_loop_remove_watch (client_loop, watch);
}
@ -58,8 +54,6 @@ static dbus_bool_t
add_client_timeout (DBusTimeout *timeout,
void *data)
{
DBusConnection *connection = data;
return _dbus_loop_add_timeout (client_loop, timeout);
}
@ -67,8 +61,6 @@ static void
remove_client_timeout (DBusTimeout *timeout,
void *data)
{
DBusConnection *connection = data;
_dbus_loop_remove_timeout (client_loop, timeout);
}

1
dbus/dbus-mainloop.c
View file

@ -253,7 +253,6 @@ cull_watches_for_invalid_fd (DBusLoop *loop,
int fd)
{
DBusList *link;
DBusList *next;
DBusList **watches;
_dbus_warn ("invalid request, socket fd %d not open\n", fd);

5
dbus/dbus-spawn-win.c
View file

@ -502,8 +502,7 @@ compose_string (char **strings, char separator)
int n = 0;
char *buf;
char *p;
const char *ptr;
if (!strings || !strings[0])
return 0;
for (i = 0; strings[i]; i++)
@ -583,7 +582,7 @@ static DWORD __stdcall
babysitter (void *parameter)
{
DBusBabysitter *sitter = (DBusBabysitter *) parameter;
int fd;
PING();
_dbus_babysitter_ref (sitter);

12
dbus/dbus-sysdeps-win.c
View file

@ -820,9 +820,6 @@ _dbus_full_duplex_pipe (int *fd1,
struct sockaddr_in saddr;
int len;
u_long arg;
fd_set read_set, write_set;
struct timeval tv;
int res;
_dbus_win_startup_winsock ();
@ -958,7 +955,6 @@ _dbus_poll (DBusPollFD *fds,
msgp += sprintf (msgp, "WSAEventSelect: to=%d\n\t", timeout_milliseconds);
for (i = 0; i < n_fds; i++)
{
static dbus_bool_t warned = FALSE;
DBusPollFD *fdp = &fds[i];
@ -1096,7 +1092,6 @@ _dbus_poll (DBusPollFD *fds,
msgp += sprintf (msgp, "select: to=%d\n\t", timeout_milliseconds);
for (i = 0; i < n_fds; i++)
{
static dbus_bool_t warned = FALSE;
DBusPollFD *fdp = &fds[i];
@ -2623,9 +2618,7 @@ dbus_bool_t
_dbus_daemon_is_session_bus_address_published (const char *scope)
{
HANDLE lock;
HANDLE mutex;
DBusString mutex_name;
DWORD ret;
if (!_dbus_get_mutex_name(&mutex_name,scope))
{
@ -2670,8 +2663,6 @@ _dbus_daemon_publish_session_bus_address (const char* address, const char *scope
{
HANDLE lock;
char *shared_addr = NULL;
DWORD ret;
char addressInfo[1024];
DBusString shm_name;
DBusString mutex_name;
@ -3131,8 +3122,6 @@ dbus_bool_t
_dbus_get_install_root(char *prefix, int len)
{
//To find the prefix, we cut the filename and also \bin\ if present
char* p = 0;
int i;
DWORD pathLength;
char *lastSlash;
SetLastError( 0 );
@ -3286,7 +3275,6 @@ _dbus_append_keyring_directory_for_credentials (DBusString *directory,
{
DBusString homedir;
DBusString dotdir;
dbus_uid_t uid;
const char *homepath;
const char *homedrive;

4
test/dbus-daemon-eavesdrop.c
View file

@ -184,7 +184,6 @@ connect_to_bus (const gchar *address)
static DBusHandlerResult
sender_send_unicast_to_sender (Fixture *f)
{
DBusError error = DBUS_ERROR_INIT;
DBusMessage *signal;
signal = dbus_message_new_signal (SENDER_PATH, SENDER_IFACE,
@ -207,7 +206,6 @@ sender_send_unicast_to_sender (Fixture *f)
static DBusHandlerResult
sender_send_unicast_to_receiver (Fixture *f)
{
DBusError error = DBUS_ERROR_INIT;
DBusMessage *signal;
signal = dbus_message_new_signal (SENDER_PATH, SENDER_IFACE, SENDER_SIGNAL_NAME);
@ -227,7 +225,6 @@ sender_send_unicast_to_receiver (Fixture *f)
static DBusHandlerResult
sender_send_broadcast (Fixture *f)
{
DBusError error = DBUS_ERROR_INIT;
DBusMessage *signal;
signal = dbus_message_new_signal (SENDER_PATH, SENDER_IFACE, SENDER_SIGNAL_NAME);
@ -252,7 +249,6 @@ sender_send_broadcast (Fixture *f)
static DBusHandlerResult
sender_send_stopper (Fixture *f)
{
DBusError error = DBUS_ERROR_INIT;
DBusMessage *signal;
signal = dbus_message_new_signal (SENDER_PATH, SENDER_IFACE, SENDER_STOPPER_NAME);