projects
/
platform
/
upstream
/
connman.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "vpn: Export vpn_ipconfig_foreach as linker symbol" into tizen
[platform/upstream/connman.git]
/
tools
/
supplicant-dbus.c
diff --git
a/tools/supplicant-dbus.c
b/tools/supplicant-dbus.c
old mode 100644
(file)
new mode 100755
(executable)
index
96d9aa8
..
d409da2
--- a/
tools/supplicant-dbus.c
+++ b/
tools/supplicant-dbus.c
@@
-2,7
+2,7
@@
*
* Connection Manager
*
*
* Connection Manager
*
- * Copyright (C) 2007-201
0
Intel Corporation. All rights reserved.
+ * Copyright (C) 2007-201
2
Intel Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@
-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) {
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);
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);
dbus_message_iter_recurse(&entry, &value);
- if (key
!= NULL
) {
+ if (key) {
if (strcmp(key, "Properties") == 0)
supplicant_dbus_property_foreach(&value,
function, user_data);
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);
}
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_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);
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:
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;
DBusMessage *message;
DBusPendingCall *call;
- if (
connection == NULL
)
+ if (
!connection
)
return -EINVAL;
return -EINVAL;
- if (
path == NULL || interface == NULL
)
+ if (
!path || !interface
)
return -EINVAL;
data = dbus_malloc0(sizeof(*data));
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");
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;
}
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);
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;
}
dbus_message_unref(message);
dbus_free(data);
return -EIO;
}
- if (
call == NULL
) {
+ if (
!call
) {
dbus_message_unref(message);
dbus_free(data);
return -EIO;
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;
else
error = NULL;
- if (
dbus_message_iter_init(reply, &iter) == FALSE
)
+ if (
!dbus_message_iter_init(reply, &iter)
)
goto done;
goto done;
- if (data->function
!= NULL
)
+ if (data->function)
data->function(error, &iter, data->user_data);
done:
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;
DBusMessageIter iter, value;
DBusPendingCall *call;
- if (
connection == NULL
)
+ if (
!connection
)
return -EINVAL;
return -EINVAL;
- if (
path == NULL || interface == NULL
)
+ if (
!path || !interface
)
return -EINVAL;
return -EINVAL;
- if (
key == NULL || signature == NULL || setup == NULL
)
+ if (
!key || !signature || !setup
)
return -EINVAL;
data = dbus_malloc0(sizeof(*data));
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");
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;
}
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);
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;
}
dbus_message_unref(message);
dbus_free(data);
return -EIO;
}
- if (
call == NULL
) {
+ if (
!call
) {
dbus_message_unref(message);
dbus_free(data);
return -EIO;
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);
dbus_message_iter_init(reply, &iter);
- if (data->function
!= NULL
)
+ if (data->function)
data->function(error, &iter, data->user_data);
dbus_message_unref(reply);
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;
DBusMessageIter iter;
DBusPendingCall *call;
- if (
connection == NULL
)
+ if (
!connection
)
return -EINVAL;
return -EINVAL;
- if (
path == NULL || interface == NULL || method == NULL
)
+ if (
!path || !interface || !method
)
return -EINVAL;
data = dbus_malloc0(sizeof(*data));
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);
return -ENOMEM;
message = dbus_message_new_method_call(SUPPLICANT_SERVICE, path,
interface, method);
- if (
message == NULL
) {
+ if (
!message
) {
dbus_free(data);
return -ENOMEM;
}
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);
dbus_message_set_auto_start(message, FALSE);
dbus_message_iter_init_append(message, &iter);
- if (setup
!= NULL
)
+ if (setup)
setup(&iter, user_data);
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;
}
dbus_message_unref(message);
dbus_free(data);
return -EIO;
}
- if (
call == NULL
) {
+ if (
!call
) {
dbus_message_unref(message);
dbus_free(data);
return -EIO;
dbus_message_unref(message);
dbus_free(data);
return -EIO;