all: merge branch 'th/errno'

https://github.com/NetworkManager/NetworkManager/pull/292

clients/cli/agent.c

@@ -25,7 +25,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <errno.h>
 #include <readline/readline.h>
 #include <readline/history.h>
 

clients/cli/common.c

@@ -25,7 +25,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <errno.h>
 #include <sys/ioctl.h>
 #include <readline/readline.h>
 #include <readline/history.h>

clients/cli/connections.c

@@ -22,10 +22,8 @@
 #include "connections.h"
 
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <errno.h>
 #include <signal.h>
 #include <netinet/ether.h>
 #include <readline/readline.h>

clients/cli/devices.c

@@ -22,9 +22,7 @@
 #include "devices.h"
 
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
-#include <errno.h>
 #include <readline/readline.h>
 
 #include "nm-secret-agent-simple.h"

clients/cli/general.c

@@ -21,7 +21,6 @@
 
 #include "general.h"
 
-#include <string.h>
 #include <stdlib.h>
 
 #include "nm-common-macros.h"

clients/cli/nmcli.c

@@ -24,7 +24,6 @@
 #include "nmcli.h"
 
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <termios.h>

clients/cli/polkit-agent.c

@@ -22,7 +22,6 @@
 #include "polkit-agent.h"
 
 #include <stdio.h>
-#include <string.h>
 #include <sys/types.h>
 #include <unistd.h>
 

clients/cli/utils.c

@@ -23,9 +23,7 @@
 #include "utils.h"
 
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
-#include <errno.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -1428,19 +1426,20 @@ pager_fallback (void)
 {
 	char buf[64];
 	int rb;
+	int errsv;
 
 	do {
 		rb = read (STDIN_FILENO, buf, sizeof (buf));
 		if (rb == -1) {
-			if (errno == EINTR) {
+			errsv = errno;
+			if (errsv == EINTR)
 				continue;
-			} else {
-				g_printerr (_("Error reading nmcli output: %s\n"), strerror (errno));
-				_exit(EXIT_FAILURE);
-			}
+			g_printerr (_("Error reading nmcli output: %s\n"), nm_strerror_native (errsv));
+			_exit(EXIT_FAILURE);
 		}
 		if (write (STDOUT_FILENO, buf, rb) == -1) {
-			g_printerr (_("Error writing nmcli output: %s\n"), strerror (errno));
+			errsv = errno;
+			g_printerr (_("Error writing nmcli output: %s\n"), nm_strerror_native (errsv));
 			_exit(EXIT_FAILURE);
 		}
 	} while (rb > 0);
@@ -1455,6 +1454,7 @@ nmc_terminal_spawn_pager (const NmcConfig *nmc_config)
 	pid_t pager_pid;
 	pid_t parent_pid;
 	int fd[2];
+	int errsv;
 
 	if (   nmc_config->in_editor
 	    || nmc_config->print_output == NMC_PRINT_TERSE
@@ -1464,7 +1464,8 @@ nmc_terminal_spawn_pager (const NmcConfig *nmc_config)
 		return 0;
 
 	if (pipe (fd) == -1) {
-		g_printerr (_("Failed to create pager pipe: %s\n"), strerror (errno));
+		errsv = errno;
+		g_printerr (_("Failed to create pager pipe: %s\n"), nm_strerror_native (errsv));
 		return 0;
 	}
 
@@ -1472,7 +1473,8 @@ nmc_terminal_spawn_pager (const NmcConfig *nmc_config)
 
 	pager_pid = fork ();
 	if (pager_pid == -1) {
-		g_printerr (_("Failed to fork pager: %s\n"), strerror (errno));
+		errsv = errno;
+		g_printerr (_("Failed to fork pager: %s\n"), nm_strerror_native (errsv));
 		nm_close (fd[0]);
 		nm_close (fd[1]);
 		return 0;
@@ -1517,10 +1519,14 @@ nmc_terminal_spawn_pager (const NmcConfig *nmc_config)
 	}
 
 	/* Return in the parent */
-	if (dup2 (fd[1], STDOUT_FILENO) < 0)
-		g_printerr (_("Failed to duplicate pager pipe: %s\n"), strerror (errno));
-	if (dup2 (fd[1], STDERR_FILENO) < 0)
-		g_printerr (_("Failed to duplicate pager pipe: %s\n"), strerror (errno));
+	if (dup2 (fd[1], STDOUT_FILENO) < 0) {
+		errsv = errno;
+		g_printerr (_("Failed to duplicate pager pipe: %s\n"), nm_strerror_native (errsv));
+	}
+	if (dup2 (fd[1], STDERR_FILENO) < 0) {
+		errsv = errno;
+		g_printerr (_("Failed to duplicate pager pipe: %s\n"), nm_strerror_native (errsv));
+	}
 
 	nm_close (fd[0]);
 	nm_close (fd[1]);

clients/common/nm-polkit-listener.c

@@ -35,7 +35,6 @@
 
 #include "nm-polkit-listener.h"
 
-#include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 

clients/common/nm-secret-agent-simple.c

@@ -35,7 +35,6 @@
 
 #include <gio/gunixoutputstream.h>
 #include <gio/gunixinputstream.h>
-#include <string.h>
 
 #include "nm-vpn-service-plugin.h"
 #include "nm-vpn-helpers.h"

clients/common/nm-vpn-helpers.c

@@ -25,8 +25,6 @@
 
 #include "nm-vpn-helpers.h"
 
-#include <string.h>
-
 #include "nm-utils.h"
 
 /*****************************************************************************/

clients/tui/newt/nmt-newt-button-box.c

@@ -31,9 +31,8 @@
 
 #include "nm-default.h"
 
-#include <string.h>
-
 #include "nmt-newt-button-box.h"
+
 #include "nmt-newt-button.h"
 
 G_DEFINE_TYPE (NmtNewtButtonBox, nmt_newt_button_box, NMT_TYPE_NEWT_CONTAINER)

clients/tui/newt/nmt-newt-container.c

@@ -28,9 +28,8 @@
 
 #include "nm-default.h"
 
-#include <string.h>
-
 #include "nmt-newt-container.h"
+
 #include "nmt-newt-component.h"
 
 G_DEFINE_ABSTRACT_TYPE (NmtNewtContainer, nmt_newt_container, NMT_TYPE_NEWT_WIDGET)

clients/tui/newt/nmt-newt-entry-numeric.c

@@ -127,8 +127,8 @@ newt_entry_numeric_validate (NmtNewtEntry *entry,
 	if (!*text)
 		return priv->optional ? TRUE : FALSE;
 
-	val = _nm_utils_ascii_str_to_int64 (text, 10, priv->min, priv->max, 0);
-	return val != 0 || errno == 0;
+	val = _nm_utils_ascii_str_to_int64 (text, 10, priv->min, priv->max, G_MAXINT64);
+	return val != G_MAXINT64 || errno == 0;
 }
 
 static void

clients/tui/newt/nmt-newt-entry.c

@@ -28,8 +28,6 @@
 
 #include "nm-default.h"
 
-#include <string.h>
-
 #include "nmt-newt-entry.h"
 #include "nmt-newt-form.h"
 #include "nmt-newt-hacks.h"

clients/tui/newt/nmt-newt-form.c

@@ -27,7 +27,6 @@
 #include "nm-default.h"
 
 #include <fcntl.h>
-#include <string.h>
 #include <unistd.h>
 
 #include "nmt-newt-form.h"

clients/tui/newt/nmt-newt-grid.c

@@ -42,8 +42,6 @@
 
 #include "nm-default.h"
 
-#include <string.h>
-
 #include "nmt-newt-grid.h"
 
 G_DEFINE_TYPE (NmtNewtGrid, nmt_newt_grid, NMT_TYPE_NEWT_CONTAINER)

clients/tui/newt/nmt-newt-label.c

@@ -27,9 +27,8 @@
 
 #include "nm-default.h"
 
-#include <string.h>
-
 #include "nmt-newt-label.h"
+
 #include "nmt-newt-utils.h"
 
 G_DEFINE_TYPE (NmtNewtLabel, nmt_newt_label, NMT_TYPE_NEWT_COMPONENT)

clients/tui/newt/nmt-newt-section.c

@@ -37,9 +37,8 @@
 
 #include "nm-default.h"
 
-#include <string.h>
-
 #include "nmt-newt-section.h"
+
 #include "nmt-newt-grid.h"
 #include "nmt-newt-label.h"
 #include "nmt-newt-utils.h"

clients/tui/newt/nmt-newt-stack.c

@@ -31,8 +31,6 @@
 
 #include "nm-default.h"
 
-#include <string.h>
-
 #include "nmt-newt-stack.h"
 
 G_DEFINE_TYPE (NmtNewtStack, nmt_newt_stack, NMT_TYPE_NEWT_CONTAINER)

clients/tui/newt/nmt-newt-textbox.c

@@ -26,9 +26,8 @@
 
 #include "nm-default.h"
 
-#include <string.h>
-
 #include "nmt-newt-textbox.h"
+
 #include "nmt-newt-utils.h"
 
 G_DEFINE_TYPE (NmtNewtTextbox, nmt_newt_textbox, NMT_TYPE_NEWT_COMPONENT)

clients/tui/newt/nmt-newt-utils.c

@@ -23,7 +23,6 @@
 
 #include "nm-default.h"
 
-#include <errno.h>
 #include <stdarg.h>
 #include <unistd.h>
 #include <sys/wait.h>

clients/tui/nm-editor-bindings.c

@@ -27,12 +27,11 @@
 
 #include "nm-default.h"
 
+#include "nm-editor-bindings.h"
+
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <stdlib.h>
-#include <string.h>
-
-#include "nm-editor-bindings.h"
 
 static void
 value_transform_string_int (const GValue *src_value,

clients/tui/nmt-address-list.c

@@ -30,12 +30,12 @@
 
 #include "nm-default.h"
 
+#include "nmt-address-list.h"
+
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <stdlib.h>
-#include <string.h>
 
-#include "nmt-address-list.h"
 #include "nmt-ip-entry.h"
 
 G_DEFINE_TYPE (NmtAddressList, nmt_address_list, NMT_TYPE_WIDGET_LIST)

clients/tui/nmt-device-entry.c

@@ -36,12 +36,12 @@
 
 #include "nm-default.h"
 
-#include <string.h>
+#include "nmt-device-entry.h"
+
 #include <sys/socket.h>
 #include <linux/if_arp.h>
 
 #include "nmtui.h"
-#include "nmt-device-entry.h"
 
 G_DEFINE_TYPE (NmtDeviceEntry, nmt_device_entry, NMT_TYPE_EDITOR_GRID)
 

clients/tui/nmt-editor-grid.c

@@ -39,8 +39,6 @@
 
 #include "nm-default.h"
 
-#include <string.h>
-
 #include "nmt-editor-grid.h"
 
 G_DEFINE_TYPE (NmtEditorGrid, nmt_editor_grid, NMT_TYPE_NEWT_CONTAINER)

clients/tui/nmt-mac-entry.c

@@ -30,8 +30,6 @@
 
 #include "nmt-mac-entry.h"
 
-#include <string.h>
-
 #include "nm-common-macros.h"
 
 G_DEFINE_TYPE (NmtMacEntry, nmt_mac_entry, NMT_TYPE_NEWT_ENTRY)

clients/tui/nmt-utils.c

@@ -23,8 +23,6 @@
 
 #include "nm-default.h"
 
-#include <string.h>
-
 #include "nmt-utils.h"
 
 /**

clients/tui/nmt-widget-list.c

@@ -32,12 +32,12 @@
 
 #include "nm-default.h"
 
+#include "nmt-widget-list.h"
+
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <stdlib.h>
-#include <string.h>
 
-#include "nmt-widget-list.h"
 #include "nmt-newt.h"
 
 G_DEFINE_TYPE (NmtWidgetList, nmt_widget_list, NMT_TYPE_NEWT_GRID)

clients/tui/nmtui.c

@@ -26,14 +26,14 @@
 
 #include "nm-default.h"
 
+#include "nmtui.h"
+
 #include <locale.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "nmt-newt.h"
 #include "nm-editor-bindings.h"
 
-#include "nmtui.h"
 #include "nmtui-edit.h"
 #include "nmtui-connect.h"
 #include "nmtui-hostname.h"

dispatcher/nm-dispatcher-utils.c

@@ -20,7 +20,7 @@
 
 #include "nm-default.h"
 
-#include <string.h>
+#include "nm-dispatcher-utils.h"
 
 #include "nm-dbus-interface.h"
 #include "nm-connection.h"
@@ -31,8 +31,6 @@
 #include "nm-dispatcher-api.h"
 #include "nm-utils.h"
 
-#include "nm-dispatcher-utils.h"
-
 /*****************************************************************************/
 
 static gboolean

dispatcher/nm-dispatcher.c

@@ -24,12 +24,10 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/types.h>
 #include <signal.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
-#include <errno.h>
 #include <arpa/inet.h>
 #include <glib-unix.h>
 

dispatcher/tests/test-dispatcher-envp.c

@@ -22,7 +22,6 @@
 
 #include <arpa/inet.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "nm-dispatcher-utils.h"
 #include "nm-dispatcher-api.h"

libnm-core/nm-connection.c

@@ -24,7 +24,6 @@
 
 #include "nm-connection.h"
 
-#include <string.h>
 #include <arpa/inet.h>
 
 #include "nm-connection-private.h"

libnm-core/nm-crypto.c

@@ -25,7 +25,6 @@
 
 #include "nm-crypto.h"
 
-#include <string.h>
 #include <strings.h>
 #include <unistd.h>
 #include <stdlib.h>

libnm-core/nm-dbus-utils.c

@@ -20,8 +20,6 @@
 
 #include "nm-default.h"
 
-#include <string.h>
-
 #include "nm-core-internal.h"
 
 typedef struct {

libnm-core/nm-errors.c

@@ -20,9 +20,8 @@
 
 #include "nm-default.h"
 
-#include <string.h>
-
 #include "nm-errors.h"
+
 #include "nm-vpn-dbus-interface.h"
 #include "nm-core-internal.h"
 

libnm-core/nm-keyfile-utils.c

@@ -20,10 +20,10 @@
 
 #include "nm-default.h"
 
-#include <stdlib.h>
-#include <string.h>
-
 #include "nm-keyfile-utils.h"
+
+#include <stdlib.h>
+
 #include "nm-keyfile-internal.h"
 #include "nm-setting-wired.h"
 #include "nm-setting-wireless.h"

libnm-core/nm-keyfile.c

@@ -23,14 +23,12 @@
 
 #include "nm-keyfile-internal.h"
 
-#include <errno.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <arpa/inet.h>
-#include <string.h>
 #include <linux/pkt_sched.h>
 
 #include "nm-utils/nm-secret-utils.h"

libnm-core/nm-property-compare.c

@@ -22,11 +22,10 @@
 
 #include "nm-default.h"
 
-#include <string.h>
-#include <netinet/in.h>
-
 #include "nm-property-compare.h"
 
+#include <netinet/in.h>
+
 static int
 _nm_property_compare_collection (GVariant *value1, GVariant *value2)
 {

libnm-core/nm-setting-8021x.c

@@ -24,8 +24,6 @@
 
 #include "nm-setting-8021x.h"
 
-#include <string.h>
-
 #include "nm-utils/nm-secret-utils.h"
 #include "nm-utils.h"
 #include "nm-crypto.h"

libnm-core/nm-setting-adsl.c

@@ -23,8 +23,6 @@
 
 #include "nm-setting-adsl.h"
 
-#include <string.h>
-
 #include "nm-setting-ppp.h"
 #include "nm-setting-private.h"
 #include "nm-utils.h"

libnm-core/nm-setting-bluetooth.c

@@ -24,7 +24,6 @@
 
 #include "nm-setting-bluetooth.h"
 
-#include <string.h>
 #include <net/ethernet.h>
 
 #include "nm-connection-private.h"

libnm-core/nm-setting-bond.c

@@ -23,9 +23,7 @@
 
 #include "nm-setting-bond.h"
 
-#include <string.h>
 #include <stdlib.h>
-#include <errno.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
@@ -177,19 +175,14 @@ nm_setting_bond_get_option (NMSettingBond *setting,
 static gboolean
 validate_int (const char *name, const char *value, const BondDefault *def)
 {
-	long num;
-	guint i;
+	guint64 num;
 
-	for (i = 0; i < strlen (value); i++) {
-		if (!g_ascii_isdigit (value[i]) && value[i] != '-')
-			return FALSE;
-	}
-
-	errno = 0;
-	num = strtol (value, NULL, 10);
-	if (errno)
+	if (!NM_STRCHAR_ALL (value, ch, g_ascii_isdigit (ch)))
 		return FALSE;
-	if (num < def->min || num > def->max)
+
+	num = _nm_utils_ascii_str_to_uint64 (value, 10, def->min, def->max, G_MAXUINT64);
+	if (   num == G_MAXUINT64
+	    && errno != 0)
 		return FALSE;
 
 	return TRUE;

libnm-core/nm-setting-bridge-port.c

@@ -23,7 +23,6 @@
 
 #include "nm-setting-bridge-port.h"
 
-#include <string.h>
 #include <ctype.h>
 #include <stdlib.h>
 

libnm-core/nm-setting-bridge.c

@@ -23,7 +23,6 @@
 
 #include "nm-setting-bridge.h"
 
-#include <string.h>
 #include <ctype.h>
 #include <stdlib.h>
 

libnm-core/nm-setting-cdma.c

@@ -23,8 +23,6 @@
 
 #include "nm-setting-cdma.h"
 
-#include <string.h>
-
 #include "nm-utils.h"
 #include "nm-setting-private.h"
 #include "nm-core-enum-types.h"

libnm-core/nm-setting-connection.c

@@ -24,8 +24,6 @@
 
 #include "nm-setting-connection.h"
 
-#include <string.h>
-
 #include "nm-utils.h"
 #include "nm-utils-private.h"
 #include "nm-core-enum-types.h"

libnm-core/nm-setting-dcb.c

@@ -23,8 +23,6 @@
 
 #include "nm-setting-dcb.h"
 
-#include <string.h>
-
 #include "nm-utils.h"
 #include "nm-utils-private.h"
 #include "nm-setting-private.h"

libnm-core/nm-setting-gsm.c

@@ -24,8 +24,6 @@
 
 #include "nm-setting-gsm.h"
 
-#include <string.h>
-
 #include "nm-utils.h"
 #include "nm-setting-private.h"
 #include "nm-core-enum-types.h"

libnm-core/nm-setting-ip-config.c

@@ -24,7 +24,6 @@
 
 #include "nm-setting-ip-config.h"
 
-#include <string.h>
 #include <arpa/inet.h>
 
 #include "nm-setting-ip4-config.h"

libnm-core/nm-setting-ip4-config.c

@@ -23,8 +23,6 @@
 
 #include "nm-setting-ip4-config.h"
 
-#include <string.h>
-
 #include "nm-setting-private.h"
 
 /**

libnm-core/nm-setting-ip6-config.c

@@ -23,7 +23,6 @@
 
 #include "nm-setting-ip6-config.h"
 
-#include <string.h>
 #include <arpa/inet.h>
 
 #include "nm-setting-private.h"

libnm-core/nm-setting-macsec.c

@@ -23,7 +23,6 @@
 #include "nm-setting-macsec.h"
 
 #include <stdlib.h>
-#include <string.h>
 
 #include "nm-utils/nm-secret-utils.h"
 

libnm-core/nm-setting-macvlan.c

@@ -24,7 +24,6 @@
 #include "nm-setting-macvlan.h"
 
 #include <stdlib.h>
-#include <string.h>
 
 #include "nm-utils.h"
 #include "nm-setting-connection.h"

libnm-core/nm-setting-olpc-mesh.c

@@ -24,8 +24,6 @@
 
 #include "nm-setting-olpc-mesh.h"
 
-#include <string.h>
-
 #include "nm-utils.h"
 #include "nm-utils-private.h"
 #include "nm-setting-private.h"

libnm-core/nm-setting-pppoe.c

@@ -24,8 +24,6 @@
 
 #include "nm-setting-pppoe.h"
 
-#include <string.h>
-
 #include "nm-setting-ppp.h"
 #include "nm-setting-private.h"
 #include "nm-core-enum-types.h"

libnm-core/nm-setting-serial.c

@@ -24,8 +24,6 @@
 
 #include "nm-setting-serial.h"
 
-#include <string.h>
-
 #include "nm-setting-private.h"
 
 /**

libnm-core/nm-setting-team-port.c

@@ -23,7 +23,6 @@
 
 #include "nm-setting-team-port.h"
 
-#include <string.h>
 #include <ctype.h>
 #include <stdlib.h>
 

libnm-core/nm-setting-team.c

@@ -23,7 +23,6 @@
 
 #include "nm-setting-team.h"
 
-#include <string.h>
 #include <stdlib.h>
 
 #include "nm-utils.h"

libnm-core/nm-setting-tun.c

@@ -24,7 +24,6 @@
 #include "nm-setting-tun.h"
 
 #include <stdlib.h>
-#include <string.h>
 
 #include "nm-utils.h"
 #include "nm-setting-connection.h"

libnm-core/nm-setting-vlan.c

@@ -24,7 +24,6 @@
 #include "nm-setting-vlan.h"
 
 #include <stdlib.h>
-#include <string.h>
 
 #include "nm-utils.h"
 #include "nm-core-types-internal.h"

libnm-core/nm-setting-vpn.c

@@ -23,8 +23,6 @@
 
 #include "nm-setting-vpn.h"
 
-#include <string.h>
-#include <errno.h>
 #include <stdlib.h>
 
 #include "nm-utils/nm-secret-utils.h"

libnm-core/nm-setting-vxlan.c

@@ -24,7 +24,6 @@
 #include "nm-setting-vxlan.h"
 
 #include <stdlib.h>
-#include <string.h>
 
 #include "nm-utils.h"
 #include "nm-setting-private.h"

libnm-core/nm-setting-wifi-p2p.c

@@ -21,7 +21,6 @@
 
 #include "nm-setting-wifi-p2p.h"
 
-#include <string.h>
 #include <net/ethernet.h>
 
 #include "nm-utils.h"

libnm-core/nm-setting-wimax.c

@@ -24,7 +24,6 @@
 
 #include "nm-setting-wimax.h"
 
-#include <string.h>
 #include <net/ethernet.h>
 
 #include "nm-setting-private.h"

libnm-core/nm-setting-wired.c

@@ -24,7 +24,6 @@
 
 #include "nm-setting-wired.h"
 
-#include <string.h>
 #include <net/ethernet.h>
 
 #include "nm-utils.h"

libnm-core/nm-setting-wireless-security.c

@@ -24,8 +24,6 @@
 
 #include "nm-setting-wireless-security.h"
 
-#include <string.h>
-
 #include "nm-setting-8021x.h"
 #include "nm-utils.h"
 #include "nm-utils-private.h"

libnm-core/nm-setting-wireless.c

@@ -24,7 +24,6 @@
 
 #include "nm-setting-wireless.h"
 
-#include <string.h>
 #include <net/ethernet.h>
 
 #include "nm-utils.h"

libnm-core/nm-setting.c

@@ -24,8 +24,6 @@
 
 #include "nm-setting.h"
 
-#include <string.h>
-
 #include "nm-setting-private.h"
 #include "nm-utils.h"
 #include "nm-core-internal.h"

libnm-core/nm-utils.c

@@ -23,8 +23,6 @@
 
 #include "nm-utils.h"
 
-#include <string.h>
-#include <errno.h>
 #include <stdlib.h>
 #include <netinet/ether.h>
 #include <arpa/inet.h>
@@ -3107,7 +3105,7 @@ _nm_utils_check_file (const char *filename,
 		g_set_error (error,
 		             NM_VPN_PLUGIN_ERROR,
 		             NM_VPN_PLUGIN_ERROR_FAILED,
-		             _("failed stat file %s: %s"), filename, strerror (errsv));
+		             _("failed stat file %s: %s"), filename, nm_strerror_native (errsv));
 		return FALSE;
 	}
 

libnm-core/nm-vpn-plugin-info.c

@@ -22,8 +22,6 @@
 
 #include "nm-vpn-plugin-info.h"
 
-#include <string.h>
-#include <errno.h>
 #include <sys/stat.h>
 
 #include "nm-errors.h"

libnm-core/tests/test-crypto.c

@@ -26,7 +26,6 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <string.h>
 
 #include "nm-crypto-impl.h"
 #include "nm-utils.h"

libnm-core/tests/test-general.c

@@ -23,8 +23,6 @@
 
 #include "nm-default.h"
 
-#include <string.h>
-
 #include "nm-utils/c-list-util.h"
 #include "nm-utils/nm-enum-utils.h"
 

libnm-core/tests/test-secrets.c

@@ -21,8 +21,6 @@
 
 #include "nm-default.h"
 
-#include <string.h>
-
 #include "nm-setting-8021x.h"
 #include "nm-setting-cdma.h"
 #include "nm-setting-connection.h"

libnm-core/tests/test-setting.c

@@ -20,7 +20,6 @@
 #include "nm-default.h"
 
 #include <linux/pkt_sched.h>
-#include <string.h>
 
 #include "nm-utils.h"
 #include "nm-utils-private.h"

libnm-core/tests/test-settings-defaults.c

@@ -21,8 +21,6 @@
 
 #include "nm-default.h"
 
-#include <string.h>
-
 #include "nm-utils.h"
 #include "nm-setting-8021x.h"
 #include "nm-setting-cdma.h"

libnm-glib/nm-vpn-plugin-utils.c

@@ -20,7 +20,6 @@
 
 #include "nm-default.h"
 
-#include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
@@ -83,7 +82,6 @@ nm_vpn_plugin_utils_read_vpn_details (int fd,
 		ssize_t nr;
 		GHashTable *hash = NULL;
 
-		errno = 0;
 		nr = read (fd, &c, 1);
 		if (nr == -1) {
 			if (errno == EAGAIN) {

libnm-util/nm-setting-bond.c

@@ -23,7 +23,6 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include <errno.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <dbus/dbus-glib.h>

libnm-util/nm-setting-vpn.c

@@ -22,7 +22,6 @@
 #include "nm-default.h"
 
 #include <string.h>
-#include <errno.h>
 #include <stdlib.h>
 #include <dbus/dbus-glib.h>
 

libnm/nm-access-point.c

@@ -23,8 +23,6 @@
 
 #include "nm-access-point.h"
 
-#include <string.h>
-
 #include "nm-connection.h"
 #include "nm-setting-connection.h"
 #include "nm-setting-wireless.h"

libnm/nm-active-connection.c

@@ -21,10 +21,9 @@
 
 #include "nm-default.h"
 
-#include <string.h>
+#include "nm-active-connection.h"
 
 #include "nm-dbus-interface.h"
-#include "nm-active-connection.h"
 #include "nm-object-private.h"
 #include "nm-core-internal.h"
 #include "nm-device.h"

libnm/nm-client.c

@@ -21,11 +21,11 @@
 
 #include "nm-default.h"
 
-#include <string.h>
+#include "nm-client.h"
+
 #include <libudev.h>
 
 #include "nm-utils.h"
-#include "nm-client.h"
 #include "nm-manager.h"
 #include "nm-dns-manager.h"
 #include "nm-remote-settings.h"

libnm/nm-dbus-helpers.c

@@ -22,8 +22,6 @@
 
 #include "nm-dbus-helpers.h"
 
-#include <string.h>
-
 #include "nm-dbus-interface.h"
 
 static GBusType nm_bus = G_BUS_TYPE_SYSTEM;

libnm/nm-device-adsl.c

@@ -23,10 +23,7 @@
 
 #include "nm-device-adsl.h"
 
-#include <string.h>
-
 #include "nm-object-private.h"
-
 #include "nm-setting-adsl.h"
 #include "nm-setting-connection.h"
 

libnm/nm-device-bond.c

@@ -20,12 +20,10 @@
 
 #include "nm-default.h"
 
-#include <string.h>
+#include "nm-setting-bond.h"
 
 #include "nm-setting-connection.h"
-#include "nm-setting-bond.h"
 #include "nm-utils.h"
-
 #include "nm-device-bond.h"
 #include "nm-object-private.h"
 #include "nm-core-internal.h"

libnm/nm-device-bridge.c

@@ -20,12 +20,10 @@
 
 #include "nm-default.h"
 
-#include <string.h>
+#include "nm-setting-bridge.h"
 
 #include "nm-setting-connection.h"
-#include "nm-setting-bridge.h"
 #include "nm-utils.h"
-
 #include "nm-device-bridge.h"
 #include "nm-object-private.h"
 #include "nm-core-internal.h"

libnm/nm-device-bt.c

@@ -21,13 +21,11 @@
 
 #include "nm-default.h"
 
-#include <string.h>
+#include "nm-device-bt.h"
 
 #include "nm-setting-connection.h"
 #include "nm-setting-bluetooth.h"
 #include "nm-utils.h"
-
-#include "nm-device-bt.h"
 #include "nm-object-private.h"
 #include "nm-enum-types.h"
 

libnm/nm-device-dummy.c

@@ -20,9 +20,8 @@
 
 #include "nm-default.h"
 
-#include <string.h>
-
 #include "nm-device-dummy.h"
+
 #include "nm-object-private.h"
 #include "nm-setting-dummy.h"
 #include "nm-setting-connection.h"

libnm/nm-device-ethernet.c

@@ -21,14 +21,12 @@
 
 #include "nm-default.h"
 
-#include <string.h>
+#include "nm-device-ethernet.h"
 
 #include "nm-setting-connection.h"
 #include "nm-setting-wired.h"
 #include "nm-setting-pppoe.h"
 #include "nm-utils.h"
-
-#include "nm-device-ethernet.h"
 #include "nm-object-private.h"
 
 G_DEFINE_TYPE (NMDeviceEthernet, nm_device_ethernet, NM_TYPE_DEVICE)

libnm/nm-device-generic.c

@@ -20,9 +20,8 @@
 
 #include "nm-default.h"
 
-#include <string.h>
-
 #include "nm-device-generic.h"
+
 #include "nm-object-private.h"
 #include "nm-setting-generic.h"
 #include "nm-setting-connection.h"

libnm/nm-device-infiniband.c

@@ -20,13 +20,11 @@
 
 #include "nm-default.h"
 
-#include <string.h>
+#include "nm-device-infiniband.h"
 
 #include "nm-setting-connection.h"
 #include "nm-setting-infiniband.h"
 #include "nm-utils.h"
-
-#include "nm-device-infiniband.h"
 #include "nm-object-private.h"
 
 G_DEFINE_TYPE (NMDeviceInfiniband, nm_device_infiniband, NM_TYPE_DEVICE)

libnm/nm-device-ip-tunnel.c

@@ -20,13 +20,11 @@
 
 #include "nm-default.h"
 
-#include <string.h>
+#include "nm-device-ip-tunnel.h"
 
 #include "nm-setting-connection.h"
 #include "nm-setting-ip-tunnel.h"
 #include "nm-utils.h"
-
-#include "nm-device-ip-tunnel.h"
 #include "nm-object-private.h"
 #include "nm-core-internal.h"
 

libnm/nm-device-macsec.c

@@ -20,9 +20,8 @@
 
 #include "nm-default.h"
 
-#include <string.h>
-
 #include "nm-device-macsec.h"
+
 #include "nm-device-private.h"
 #include "nm-object-private.h"
 #include "nm-utils.h"

libnm/nm-device-macvlan.c

@@ -20,13 +20,11 @@
 
 #include "nm-default.h"
 
-#include <string.h>
+#include "nm-setting-macvlan.h"
 
 #include "nm-setting-connection.h"
-#include "nm-setting-macvlan.h"
 #include "nm-setting-wired.h"
 #include "nm-utils.h"
-
 #include "nm-device-macvlan.h"
 #include "nm-object-private.h"
 

libnm/nm-device-modem.c

@@ -21,13 +21,11 @@
 
 #include "nm-default.h"
 
-#include <string.h>
+#include "nm-device-modem.h"
 
 #include "nm-setting-connection.h"
 #include "nm-setting-gsm.h"
 #include "nm-setting-cdma.h"
-
-#include "nm-device-modem.h"
 #include "nm-object-private.h"
 #include "nm-enum-types.h"
 

libnm/nm-device-olpc-mesh.c

@@ -20,12 +20,10 @@
 
 #include "nm-default.h"
 
-#include <string.h>
+#include "nm-device-olpc-mesh.h"
 
 #include "nm-setting-connection.h"
 #include "nm-setting-olpc-mesh.h"
-
-#include "nm-device-olpc-mesh.h"
 #include "nm-object-private.h"
 #include "nm-device-wifi.h"
 

libnm/nm-device-ovs-bridge.c

@@ -19,9 +19,8 @@
 
 #include "nm-default.h"
 
-#include <string.h>
-
 #include "nm-device-ovs-bridge.h"
+
 #include "nm-object-private.h"
 #include "nm-setting-ovs-bridge.h"
 #include "nm-setting-ovs-port.h"

libnm/nm-device-ovs-interface.c

@@ -19,9 +19,8 @@
 
 #include "nm-default.h"
 
-#include <string.h>
-
 #include "nm-device-ovs-interface.h"
+
 #include "nm-object-private.h"
 #include "nm-setting-ovs-interface.h"
 #include "nm-setting-ovs-port.h"

libnm/nm-device-ovs-port.c

@@ -19,9 +19,8 @@
 
 #include "nm-default.h"
 
-#include <string.h>
-
 #include "nm-device-ovs-port.h"
+
 #include "nm-object-private.h"
 #include "nm-setting-ovs-port.h"
 #include "nm-setting-ovs-port.h"