summaryrefslogtreecommitdiff
path: root/vpn/vpn-manager.c
diff options
context:
space:
mode:
authorZhang zhengguang <zhengguang.zhang@intel.com>2014-07-17 02:37:39 (GMT)
committerZhang zhengguang <zhengguang.zhang@intel.com>2014-07-17 02:37:39 (GMT)
commit1b9d0a62f59bb48c8deb2f0b98d9acdffdd9abe7 (patch)
tree6e991827d28537f7f40f20786c2354fd04a9fdad /vpn/vpn-manager.c
parentfbe905ab58ecc31fe64c410c5f580cadc30e7f04 (diff)
downloadconnman-1b9d0a62f59bb48c8deb2f0b98d9acdffdd9abe7.zip
connman-1b9d0a62f59bb48c8deb2f0b98d9acdffdd9abe7.tar.gz
connman-1b9d0a62f59bb48c8deb2f0b98d9acdffdd9abe7.tar.bz2
Imported Upstream version 1.24upstream/1.24
Diffstat (limited to 'vpn/vpn-manager.c')
-rw-r--r--vpn/vpn-manager.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/vpn/vpn-manager.c b/vpn/vpn-manager.c
index 1ba745b..021d625 100644
--- 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
@@ -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,