Imported Upstream connman version 1.38

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

diff --git a/vpn/vpn-manager.c b/vpn/vpn-manager.c
old mode 100644 (file)
new mode 100755 (executable)
index cd85165..021d625
--- a/vpn/vpn-manager.c
+++ b/vpn/vpn-manager.c
@@ -2,7 +2,7 @@
  *
  *  ConnMan VPN daemon
  *
- *  Copyright (C) 2012  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2012-2013  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
@@ -43,7 +43,7 @@ static DBusMessage *create(DBusConnection *conn, DBusMessage *msg, void *data)
 
        DBG("conn %p", conn);
 
-       err = __vpn_provider_create_and_connect(msg);
+       err = __vpn_provider_create(msg);
        if (err < 0) {
                if (err == -EINPROGRESS) {
                        connman_error("Invalid return code (%d) "
@@ -82,8 +82,8 @@ static DBusMessage *get_connections(DBusConnection *conn, DBusMessage *msg,
        DBG("conn %p", conn);
 
        reply = __vpn_provider_get_connections(msg);
-       if (reply == NULL)
-               return __connman_error_failed(msg, -EINVAL);
+       if (!reply)
+               return __connman_error_failed(msg, EINVAL);
 
        return reply;
 }
@@ -162,7 +162,7 @@ int __vpn_manager_init(void)
        DBG("");
 
        connection = connman_dbus_get_connection();
-       if (connection == NULL)
+       if (!connection)
                return -1;
 
        g_dbus_register_interface(connection, VPN_MANAGER_PATH,
@@ -179,7 +179,7 @@ void __vpn_manager_cleanup(void)
 {
        DBG("");
 
-       if (connection == NULL)
+       if (!connection)
                return;
 
        g_dbus_unregister_interface(connection, VPN_MANAGER_PATH,