diff options
Diffstat (limited to 'gdbus/object.c')
| -rw-r--r-- | gdbus/object.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/gdbus/object.c b/gdbus/object.c index cc3c5da8..d881c588 100644 --- a/gdbus/object.c +++ b/gdbus/object.c @@ -201,12 +201,12 @@ static DBusMessage *introspect(DBusConnection *connection, return NULL; } - if (!data->introspect) + if (data->introspect == NULL) generate_introspection_xml(connection, data, dbus_message_get_path(message)); reply = dbus_message_new_method_return(message); - if (!reply) + if (reply == NULL) return NULL; dbus_message_append_args(reply, DBUS_TYPE_STRING, &data->introspect, @@ -405,7 +405,7 @@ static struct interface_data *find_interface(GSList *interfaces, { GSList *list; - if (!name) + if (name == NULL) return NULL; for (list = interfaces; list; list = list->next) { @@ -428,7 +428,7 @@ static DBusHandlerResult generic_message(DBusConnection *connection, interface = dbus_message_get_interface(message); iface = find_interface(data->interfaces, interface); - if (!iface) + if (iface == NULL) return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; for (method = iface->methods; method && @@ -464,7 +464,7 @@ static void invalidate_parent_data(DBusConnection *conn, const char *child_path) parent_path = g_strdup(child_path); slash = strrchr(parent_path, '/'); - if (!slash) + if (slash == NULL) goto done; if (slash == parent_path && parent_path[1] != '\0') @@ -481,7 +481,7 @@ static void invalidate_parent_data(DBusConnection *conn, const char *child_path) goto done; } - if (!data) + if (data == NULL) goto done; g_free(data->introspect); @@ -554,7 +554,7 @@ static gboolean remove_interface(struct generic_data *data, const char *name) struct interface_data *iface; iface = find_interface(data->interfaces, name); - if (!iface) + if (iface == NULL) return FALSE; data->interfaces = g_slist_remove(data->interfaces, iface); @@ -601,14 +601,14 @@ static gboolean check_signal(DBusConnection *conn, const char *path, *args = NULL; if (!dbus_connection_get_object_path_data(conn, path, - (void *) &data) || !data) { + (void *) &data) || data == NULL) { error("dbus_connection_emit_signal: path %s isn't registered", path); return FALSE; } iface = find_interface(data->interfaces, interface); - if (!iface) { + if (iface == NULL) { error("dbus_connection_emit_signal: %s does not implement %s", path, interface); return FALSE; @@ -621,7 +621,7 @@ static gboolean check_signal(DBusConnection *conn, const char *path, } } - if (!*args) { + if (*args == NULL) { error("No signal named %s on interface %s", name, interface); return FALSE; } @@ -644,7 +644,7 @@ static dbus_bool_t emit_signal_valist(DBusConnection *conn, return FALSE; signal = dbus_message_new_signal(path, interface, name); - if (!signal) { + if (signal == NULL) { error("Unable to allocate new %s.%s signal", interface, name); return FALSE; } @@ -702,7 +702,7 @@ gboolean g_dbus_unregister_interface(DBusConnection *connection, { struct generic_data *data = NULL; - if (!path) + if (path == NULL) return FALSE; if (dbus_connection_get_object_path_data(connection, path, |