jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

dbus: Remove unnecessary indentation by cleaning up if/else structure

Browse source
This commit is contained in:
Jouni Malinen 2009-12-26 17:28:19 +02:00
parent d401b48f3c
commit fae3a72f93
1 changed files with 40 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
wpa_supplicant/dbus/dbus_new_handlers.c
View file

@ -234,10 +234,8 @@ static DBusMessage * set_network_properties(DBusMessage *message,
DBusMessage *reply = NULL; DBusMessage *reply = NULL;
DBusMessageIter iter_dict; DBusMessageIter iter_dict;
if (!wpa_dbus_dict_open_read(iter, &iter_dict)) { if (!wpa_dbus_dict_open_read(iter, &iter_dict))
reply = wpas_dbus_error_invald_args(message, NULL); return wpas_dbus_error_invald_args(message, NULL);
goto out;
}
while (wpa_dbus_dict_has_dict_entry(&iter_dict)) { while (wpa_dbus_dict_has_dict_entry(&iter_dict)) {
char *value = NULL; char *value = NULL;
@ -245,7 +243,7 @@ static DBusMessage * set_network_properties(DBusMessage *message,
int ret; int ret;
if (!wpa_dbus_dict_get_entry(&iter_dict, &entry)) { if (!wpa_dbus_dict_get_entry(&iter_dict, &entry)) {
reply = wpas_dbus_error_invald_args(message, NULL); reply = wpas_dbus_error_invald_args(message, NULL);
goto out; break;
} }
if (entry.type == DBUS_TYPE_ARRAY && if (entry.type == DBUS_TYPE_ARRAY &&
entry.array_type == DBUS_TYPE_BYTE) { entry.array_type == DBUS_TYPE_BYTE) {
@ -262,8 +260,7 @@ static DBusMessage * set_network_properties(DBusMessage *message,
entry.array_len); entry.array_len);
if (ret <= 0) if (ret <= 0)
goto error; goto error;
} else { } else if (entry.type == DBUS_TYPE_STRING) {
if (entry.type == DBUS_TYPE_STRING) {
if (should_quote_opt(entry.key)) { if (should_quote_opt(entry.key)) {
size = os_strlen(entry.str_value); size = os_strlen(entry.str_value);
if (size <= 0) if (size <= 0)
@ -274,19 +271,16 @@ static DBusMessage * set_network_properties(DBusMessage *message,
if (value == NULL) if (value == NULL)
goto error; goto error;
ret = os_snprintf(value, size, ret = os_snprintf(value, size, "\"%s\"",
"\"%s\"",
entry.str_value); entry.str_value);
if (ret < 0 || if (ret < 0 || (size_t) ret != (size - 1))
(size_t) ret != (size - 1))
goto error; goto error;
} else { } else {
value = os_strdup(entry.str_value); value = os_strdup(entry.str_value);
if (value == NULL) if (value == NULL)
goto error; goto error;
} }
} else { } else if (entry.type == DBUS_TYPE_UINT32) {
if (entry.type == DBUS_TYPE_UINT32) {
value = os_zalloc(size); value = os_zalloc(size);
if (value == NULL) if (value == NULL)
goto error; goto error;
@ -295,22 +289,17 @@ static DBusMessage * set_network_properties(DBusMessage *message,
entry.uint32_value); entry.uint32_value);
if (ret <= 0) if (ret <= 0)
goto error; goto error;
} else { } else if (entry.type == DBUS_TYPE_INT32) {
if (entry.type == DBUS_TYPE_INT32) {
value = os_zalloc(size); value = os_zalloc(size);
if (value == NULL) if (value == NULL)
goto error; goto error;
ret = os_snprintf( ret = os_snprintf(value, size, "%d",
value, size, "%d",
entry.int32_value); entry.int32_value);
if (ret <= 0) if (ret <= 0)
goto error; goto error;
} else } else
goto error; goto error;
}
}
}
if (wpa_config_set(ssid, entry.key, value, 0) < 0) if (wpa_config_set(ssid, entry.key, value, 0) < 0)
goto error; goto error;
@ -330,7 +319,7 @@ static DBusMessage * set_network_properties(DBusMessage *message,
wpa_dbus_dict_entry_clear(&entry); wpa_dbus_dict_entry_clear(&entry);
break; break;
} }
out:
return reply; return reply;
} }