Imported Upstream version 1.24

[platform/upstream/connman.git] / vpn / vpn-agent.c

diff --git a/vpn/vpn-agent.c b/vpn/vpn-agent.c
index f1cfb1e..b0b582b 100644 (file)
--- a/vpn/vpn-agent.c
+++ b/vpn/vpn-agent.c
@@ -35,7 +35,7 @@
 #include "vpn-agent.h"
 #include "vpn.h"
 
-connman_bool_t vpn_agent_check_reply_has_dict(DBusMessage *reply)
+bool vpn_agent_check_reply_has_dict(DBusMessage *reply)
 {
        const char *signature = DBUS_TYPE_ARRAY_AS_STRING
                DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING
@@ -43,8 +43,8 @@ connman_bool_t vpn_agent_check_reply_has_dict(DBusMessage *reply)
                DBUS_TYPE_VARIANT_AS_STRING
                DBUS_DICT_ENTRY_END_CHAR_AS_STRING;
 
-       if (dbus_message_has_signature(reply, signature) == TRUE)
-               return TRUE;
+       if (dbus_message_has_signature(reply, signature))
+               return true;
 
        connman_warn("Reply %s to %s from %s has wrong signature %s",
                        signature,
@@ -52,7 +52,7 @@ connman_bool_t vpn_agent_check_reply_has_dict(DBusMessage *reply)
                        dbus_message_get_sender(reply),
                        dbus_message_get_signature(reply));
 
-       return FALSE;
+       return false;
 }
 
 static void request_input_append_name(DBusMessageIter *iter, void *user_data)
@@ -117,9 +117,9 @@ static void request_input_append_user_info(DBusMessageIter *iter,
        connman_dbus_dict_append_basic(iter, "Requirement",
                                DBUS_TYPE_STRING, &str);
 
-       if (data->username_str != NULL) {
+       if (data->username_str) {
                str = vpn_provider_get_string(provider, data->username_str);
-               if (str != NULL)
+               if (str)
                        connman_dbus_dict_append_basic(iter, "Value",
                                                DBUS_TYPE_STRING, &str);
        }