From 0a12a1711c202c0347581d9f6cf03cbe02246dd6 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 20 Jan 2016 11:10:48 -0600 Subject: [PATCH] libnm-core,core,cli: fix spelling of NM_IP_TUNNEL_MODE_UNKNOWN Fixes: b614a5ec6174bd6dce1ea9593160dd7164fdbd57 Fixes: ae8c7a8967c6f91aeeea75a37cd3d14bf0edb67d Fixes: 570fdce93f44a51dbd84bbfe098913141c94b789 --- clients/cli/connections.c | 4 ++-- clients/cli/settings.c | 4 ++-- libnm-core/nm-dbus-interface.h | 2 +- src/devices/nm-device-ip-tunnel.c | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/clients/cli/connections.c b/clients/cli/connections.c index 9ab926a021..d984b4d6fc 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -6184,7 +6184,7 @@ cleanup_tun: gs_free char *values_str = NULL; values = nm_utils_enum_get_values (nm_ip_tunnel_mode_get_type (), - NM_IP_TUNNEL_MODE_UKNOWN + 1, + NM_IP_TUNNEL_MODE_UNKNOWN + 1, G_MAXINT); values_str = g_strjoinv (",", (char **) values); g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, @@ -6787,7 +6787,7 @@ gen_func_ip_tunnel_mode (const char *text, int state) gs_free const char **words = NULL; words = nm_utils_enum_get_values (nm_ip_tunnel_mode_get_type (), - NM_IP_TUNNEL_MODE_UKNOWN + 1, + NM_IP_TUNNEL_MODE_UNKNOWN + 1, G_MAXINT); return nmc_rl_gen_func_basic (text, state, words); } diff --git a/clients/cli/settings.c b/clients/cli/settings.c index 70984bbb03..baf0a925ee 100644 --- a/clients/cli/settings.c +++ b/clients/cli/settings.c @@ -1420,7 +1420,7 @@ nmc_property_ip_tunnel_allowed_mode (NMSetting *setting, const char *prop) if (!words) words = nm_utils_enum_get_values (nm_ip_tunnel_mode_get_type (), - NM_IP_TUNNEL_MODE_UKNOWN + 1, + NM_IP_TUNNEL_MODE_UNKNOWN + 1, G_MAXINT); return words; } @@ -1825,7 +1825,7 @@ nmc_property_ip_tunnel_set_mode (NMSetting *setting, const char *prop, gs_free char *values_str = NULL; values = nm_utils_enum_get_values (nm_ip_tunnel_mode_get_type (), - NM_IP_TUNNEL_MODE_UKNOWN + 1, + NM_IP_TUNNEL_MODE_UNKNOWN + 1, G_MAXINT); values_str = g_strjoinv (",", (char **) values); g_set_error (error, 1, 0, _("invalid mode '%s', use one of %s"), diff --git a/libnm-core/nm-dbus-interface.h b/libnm-core/nm-dbus-interface.h index b32aabc2b5..2edc8cb49d 100644 --- a/libnm-core/nm-dbus-interface.h +++ b/libnm-core/nm-dbus-interface.h @@ -692,7 +692,7 @@ typedef enum /*< flags >*/ { * Since: 1.2 */ typedef enum { - NM_IP_TUNNEL_MODE_UKNOWN = 0, + NM_IP_TUNNEL_MODE_UNKNOWN = 0, NM_IP_TUNNEL_MODE_IPIP = 1, NM_IP_TUNNEL_MODE_GRE = 2, NM_IP_TUNNEL_MODE_SIT = 3, diff --git a/src/devices/nm-device-ip-tunnel.c b/src/devices/nm-device-ip-tunnel.c index 6d0df059e8..fe105cc87b 100644 --- a/src/devices/nm-device-ip-tunnel.c +++ b/src/devices/nm-device-ip-tunnel.c @@ -554,13 +554,13 @@ platform_link_to_tunnel_mode (const NMPlatformLink *link) else if (lnk->proto == IPPROTO_IPV6) return NM_IP_TUNNEL_MODE_IP6IP6; else - return NM_IP_TUNNEL_MODE_UKNOWN; + return NM_IP_TUNNEL_MODE_UNKNOWN; case NM_LINK_TYPE_IPIP: return NM_IP_TUNNEL_MODE_IPIP; case NM_LINK_TYPE_SIT: return NM_IP_TUNNEL_MODE_SIT; default: - g_return_val_if_reached (NM_IP_TUNNEL_MODE_UKNOWN); + g_return_val_if_reached (NM_IP_TUNNEL_MODE_UNKNOWN); } } @@ -997,7 +997,7 @@ create_device (NMDeviceFactory *factory, mode = platform_link_to_tunnel_mode (plink); } - if (mode == NM_IP_TUNNEL_MODE_UKNOWN) + if (mode == NM_IP_TUNNEL_MODE_UNKNOWN) return NULL; return (NMDevice *) g_object_new (NM_TYPE_DEVICE_IP_TUNNEL,