diff options
Diffstat (limited to 'tools/supplicant-dbus.c')
-rw-r--r-- | tools/supplicant-dbus.c | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/tools/supplicant-dbus.c b/tools/supplicant-dbus.c index 028a2753..d409da2d 100644 --- a/tools/supplicant-dbus.c +++ b/tools/supplicant-dbus.c @@ -51,7 +51,7 @@ void supplicant_dbus_array_foreach(DBusMessageIter *iter, dbus_message_iter_recurse(iter, &entry); while (dbus_message_iter_get_arg_type(&entry) != DBUS_TYPE_INVALID) { - if (function != NULL) + if (function) function(&entry, user_data); dbus_message_iter_next(&entry); @@ -86,11 +86,11 @@ void supplicant_dbus_property_foreach(DBusMessageIter *iter, dbus_message_iter_recurse(&entry, &value); - if (key != NULL) { + if (key) { if (strcmp(key, "Properties") == 0) supplicant_dbus_property_foreach(&value, function, user_data); - else if (function != NULL) + else if (function) function(key, &value, user_data); } @@ -114,13 +114,13 @@ static void property_get_all_reply(DBusPendingCall *call, void *user_data) if (dbus_message_get_type(reply) == DBUS_MESSAGE_TYPE_ERROR) goto done; - if (dbus_message_iter_init(reply, &iter) == FALSE) + if (!dbus_message_iter_init(reply, &iter)) goto done; supplicant_dbus_property_foreach(&iter, data->function, data->user_data); - if (data->function != NULL) + if (data->function) data->function(NULL, NULL, data->user_data); done: @@ -137,19 +137,19 @@ int supplicant_dbus_property_get_all(const char *path, const char *interface, DBusMessage *message; DBusPendingCall *call; - if (connection == NULL) + if (!connection) return -EINVAL; - if (path == NULL || interface == NULL) + if (!path || !interface) return -EINVAL; data = dbus_malloc0(sizeof(*data)); - if (data == NULL) + if (!data) return -ENOMEM; message = dbus_message_new_method_call(SUPPLICANT_SERVICE, path, DBUS_INTERFACE_PROPERTIES, "GetAll"); - if (message == NULL) { + if (!message) { dbus_free(data); return -ENOMEM; } @@ -158,14 +158,14 @@ int supplicant_dbus_property_get_all(const char *path, const char *interface, dbus_message_append_args(message, DBUS_TYPE_STRING, &interface, NULL); - if (dbus_connection_send_with_reply(connection, message, - &call, TIMEOUT) == FALSE) { + if (!dbus_connection_send_with_reply(connection, message, + &call, TIMEOUT)) { dbus_message_unref(message); dbus_free(data); return -EIO; } - if (call == NULL) { + if (!call) { dbus_message_unref(message); dbus_free(data); return -EIO; @@ -201,10 +201,10 @@ static void property_set_reply(DBusPendingCall *call, void *user_data) else error = NULL; - if (dbus_message_iter_init(reply, &iter) == FALSE) + if (!dbus_message_iter_init(reply, &iter)) goto done; - if (data->function != NULL) + if (data->function) data->function(error, &iter, data->user_data); done: @@ -224,22 +224,22 @@ int supplicant_dbus_property_set(const char *path, const char *interface, DBusMessageIter iter, value; DBusPendingCall *call; - if (connection == NULL) + if (!connection) return -EINVAL; - if (path == NULL || interface == NULL) + if (!path || !interface) return -EINVAL; - if (key == NULL || signature == NULL || setup == NULL) + if (!key || !signature || !setup) return -EINVAL; data = dbus_malloc0(sizeof(*data)); - if (data == NULL) + if (!data) return -ENOMEM; message = dbus_message_new_method_call(SUPPLICANT_SERVICE, path, DBUS_INTERFACE_PROPERTIES, "Set"); - if (message == NULL) { + if (!message) { dbus_free(data); return -ENOMEM; } @@ -255,14 +255,14 @@ int supplicant_dbus_property_set(const char *path, const char *interface, setup(&value, user_data); dbus_message_iter_close_container(&iter, &value); - if (dbus_connection_send_with_reply(connection, message, - &call, TIMEOUT) == FALSE) { + if (!dbus_connection_send_with_reply(connection, message, + &call, TIMEOUT)) { dbus_message_unref(message); dbus_free(data); return -EIO; } - if (call == NULL) { + if (!call) { dbus_message_unref(message); dbus_free(data); return -EIO; @@ -300,7 +300,7 @@ static void method_call_reply(DBusPendingCall *call, void *user_data) dbus_message_iter_init(reply, &iter); - if (data->function != NULL) + if (data->function) data->function(error, &iter, data->user_data); dbus_message_unref(reply); @@ -319,19 +319,19 @@ int supplicant_dbus_method_call(const char *path, DBusMessageIter iter; DBusPendingCall *call; - if (connection == NULL) + if (!connection) return -EINVAL; - if (path == NULL || interface == NULL || method == NULL) + if (!path || !interface || !method) return -EINVAL; data = dbus_malloc0(sizeof(*data)); - if (data == NULL) + if (!data) return -ENOMEM; message = dbus_message_new_method_call(SUPPLICANT_SERVICE, path, interface, method); - if (message == NULL) { + if (!message) { dbus_free(data); return -ENOMEM; } @@ -339,17 +339,17 @@ int supplicant_dbus_method_call(const char *path, dbus_message_set_auto_start(message, FALSE); dbus_message_iter_init_append(message, &iter); - if (setup != NULL) + if (setup) setup(&iter, user_data); - if (dbus_connection_send_with_reply(connection, message, - &call, TIMEOUT) == FALSE) { + if (!dbus_connection_send_with_reply(connection, message, + &call, TIMEOUT)) { dbus_message_unref(message); dbus_free(data); return -EIO; } - if (call == NULL) { + if (!call) { dbus_message_unref(message); dbus_free(data); return -EIO; |