diff options
Diffstat (limited to 'gdbus/watch.c')
| -rw-r--r-- | gdbus/watch.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/gdbus/watch.c b/gdbus/watch.c index c0dcc934..e7c203ae 100644 --- a/gdbus/watch.c +++ b/gdbus/watch.c @@ -204,8 +204,7 @@ static struct filter_data *filter_data_get(DBusConnection *connection, struct filter_data *data; const char *name = NULL, *owner = NULL; - if (!filter_data_find(connection, NULL, NULL, NULL, NULL, NULL, - NULL)) { + if (filter_data_find(connection, NULL, NULL, NULL, NULL, NULL, NULL) == NULL) { if (!dbus_connection_add_filter(connection, message_filter, NULL, NULL)) { error("dbus_connection_add_filter() failed"); @@ -382,7 +381,7 @@ static gboolean filter_data_remove_callback(struct filter_data *data, /* Remove filter if there are no listeners left for the connection */ data = filter_data_find(connection, NULL, NULL, NULL, NULL, NULL, NULL); - if (!data) + if (data == NULL) dbus_connection_remove_filter(connection, message_filter, NULL); @@ -480,7 +479,7 @@ static DBusHandlerResult service_filter(DBusConnection *connection, /* Only auto remove if it is a bus name watch */ if (data->argument[0] == ':' && - (!cb->conn_func || !cb->disc_func)) { + (cb->conn_func == NULL || cb->disc_func == NULL)) { filter_data_remove_callback(data, cb); continue; } @@ -517,7 +516,7 @@ static DBusHandlerResult message_filter(DBusConnection *connection, /* Sender is always bus name */ data = filter_data_find(connection, NULL, sender, path, iface, member, arg); - if (!data) { + if (data == NULL) { error("Got %s.%s signal which has no listeners", iface, member); return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } @@ -543,7 +542,7 @@ static DBusHandlerResult message_filter(DBusConnection *connection, /* Remove filter if there no listener left for the connection */ data = filter_data_find(connection, NULL, NULL, NULL, NULL, NULL, NULL); - if (!data) + if (data == NULL) dbus_connection_remove_filter(connection, message_filter, NULL); @@ -658,18 +657,18 @@ guint g_dbus_add_service_watch(DBusConnection *connection, const char *name, struct filter_data *data; struct filter_callback *cb; - if (!name) + if (name == NULL) return 0; data = filter_data_get(connection, service_filter, NULL, NULL, DBUS_INTERFACE_DBUS, "NameOwnerChanged", name); - if (!data) + if (data == NULL) return 0; cb = filter_data_add_callback(data, connect, disconnect, NULL, NULL, user_data); - if (!cb) + if (cb == NULL) return 0; if (connect) @@ -697,12 +696,12 @@ guint g_dbus_add_signal_watch(DBusConnection *connection, data = filter_data_get(connection, signal_filter, sender, path, interface, member, NULL); - if (!data) + if (data == NULL) return 0; cb = filter_data_add_callback(data, NULL, NULL, function, destroy, user_data); - if (!cb) + if (cb == NULL) return 0; if (data->name != NULL && data->name_watch == 0) |