[network-manager-openvpn: 6/7] all: minor style fixes
- From: Thomas Haller <thaller src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-openvpn: 6/7] all: minor style fixes
- Date: Thu, 8 Sep 2016 10:34:19 +0000 (UTC)
commit 8301eb2cfd25ea4969660c0c83f9262cc15c1a8c
Author: Thomas Haller <thaller redhat com>
Date: Thu Sep 8 11:53:04 2016 +0200
all: minor style fixes
properties/import-export.c | 3 +--
shared/utils.h | 3 +--
src/nm-openvpn-service.c | 3 +--
3 files changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/properties/import-export.c b/properties/import-export.c
index 957453f..3fc7c36 100644
--- a/properties/import-export.c
+++ b/properties/import-export.c
@@ -1932,9 +1932,8 @@ do_export_create (NMConnection *connection, const char *path, GError **error)
if (name) {
type = g_strndup (x509_name, name - x509_name);
name++;
- } else {
+ } else
name = x509_name;
- }
args_write_line (f, NMV_OVPN_TAG_VERIFY_X509_NAME, name, type);
}
diff --git a/shared/utils.h b/shared/utils.h
index 5a1323e..61b35b6 100644
--- a/shared/utils.h
+++ b/shared/utils.h
@@ -69,8 +69,8 @@
#define NMV_OVPN_TAG_TLS_CLIENT "tls-client"
#define NMV_OVPN_TAG_TLS_REMOTE "tls-remote"
#define NMV_OVPN_TAG_TOPOLOGY "topology"
-#define NMV_OVPN_TAG_TUN_MTU "tun-mtu"
#define NMV_OVPN_TAG_TUN_IPV6 "tun-ipv6"
+#define NMV_OVPN_TAG_TUN_MTU "tun-mtu"
#define NMV_OVPN_TAG_USER "user"
#define NMV_OVPN_TAG_VERIFY_X509_NAME "verify-x509-name"
@@ -84,4 +84,3 @@ char * nmv_utils_str_utf8safe_unescape (const char *str);
const char *nmv_utils_str_utf8safe_unescape_c (const char *str, char **str_free);
#endif /* UTILS_H */
-
diff --git a/src/nm-openvpn-service.c b/src/nm-openvpn-service.c
index d2b2075..bd07fe7 100644
--- a/src/nm-openvpn-service.c
+++ b/src/nm-openvpn-service.c
@@ -1439,9 +1439,8 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin,
if (name) {
type = g_strndup (tmp, name - tmp);
name++;
- } else {
+ } else
name = tmp;
- }
if (!name[0] || !g_utf8_validate(name, -1, NULL)) {
g_set_error (error, NM_VPN_PLUGIN_ERROR,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]