summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2018-02-02 10:55:34 +0100
committerThomas Haller <thaller@redhat.com>2018-02-07 13:32:04 +0100
commite4839accf5a5b470b9bf2287f0269ddc4ce0f91b (patch)
treebdc92d91b24d7b7fb25d8b9652dbe08d08e57cea /src
parentca7273b3e250e46451d93e75a2234c403eed38aa (diff)
downloadNetworkManager-e4839accf5a5b470b9bf2287f0269ddc4ce0f91b.tar.gz
all: replace non-leading tabs with spaces
We commonly only allow tabs at the beginning of a line, not afterwards. The reason for this style is so that the code looks formated right with tabstop=4 and tabstop=8.
Diffstat (limited to 'src')
-rw-r--r--src/devices/nm-device-ethernet.h18
-rw-r--r--src/devices/nm-device-private.h2
-rw-r--r--src/devices/nm-device.c4
-rw-r--r--src/dhcp/nm-dhcp-dhclient.c8
-rw-r--r--src/dhcp/nm-dhcp-dhcpcanon.c6
-rw-r--r--src/dhcp/nm-dhcp-dhcpcd.c10
-rw-r--r--src/nm-checkpoint.c2
-rw-r--r--src/platform/wifi/wifi-utils-nl80211.c2
-rw-r--r--src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c6
-rw-r--r--src/supplicant/nm-supplicant-settings-verify.c8
-rw-r--r--src/supplicant/nm-supplicant-types.h6
11 files changed, 36 insertions, 36 deletions
diff --git a/src/devices/nm-device-ethernet.h b/src/devices/nm-device-ethernet.h
index a50a7d851b..22fae29397 100644
--- a/src/devices/nm-device-ethernet.h
+++ b/src/devices/nm-device-ethernet.h
@@ -24,12 +24,12 @@
#include "nm-device.h"
-#define NM_TYPE_DEVICE_ETHERNET (nm_device_ethernet_get_type ())
-#define NM_DEVICE_ETHERNET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_ETHERNET, NMDeviceEthernet))
-#define NM_DEVICE_ETHERNET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_ETHERNET, NMDeviceEthernetClass))
-#define NM_IS_DEVICE_ETHERNET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEVICE_ETHERNET))
-#define NM_IS_DEVICE_ETHERNET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DEVICE_ETHERNET))
-#define NM_DEVICE_ETHERNET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_ETHERNET, NMDeviceEthernetClass))
+#define NM_TYPE_DEVICE_ETHERNET (nm_device_ethernet_get_type ())
+#define NM_DEVICE_ETHERNET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_ETHERNET, NMDeviceEthernet))
+#define NM_DEVICE_ETHERNET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_ETHERNET, NMDeviceEthernetClass))
+#define NM_IS_DEVICE_ETHERNET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEVICE_ETHERNET))
+#define NM_IS_DEVICE_ETHERNET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DEVICE_ETHERNET))
+#define NM_DEVICE_ETHERNET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_ETHERNET, NMDeviceEthernetClass))
#define NM_DEVICE_ETHERNET_SPEED "speed"
#define NM_DEVICE_ETHERNET_S390_SUBCHANNELS "s390-subchannels"
@@ -37,12 +37,12 @@
struct _NMDeviceEthernetPrivate;
typedef struct {
- NMDevice parent;
- struct _NMDeviceEthernetPrivate *_priv;
+ NMDevice parent;
+ struct _NMDeviceEthernetPrivate *_priv;
} NMDeviceEthernet;
typedef struct {
- NMDeviceClass parent;
+ NMDeviceClass parent;
} NMDeviceEthernetClass;
GType nm_device_ethernet_get_type (void);
diff --git a/src/devices/nm-device-private.h b/src/devices/nm-device-private.h
index 4aa7d4364c..b0d3ffa4f6 100644
--- a/src/devices/nm-device-private.h
+++ b/src/devices/nm-device-private.h
@@ -141,4 +141,4 @@ gboolean nm_device_match_hwaddr (NMDevice *device,
NMConnection *connection,
gboolean fail_if_no_hwaddr);
-#endif /* NM_DEVICE_PRIVATE_H */
+#endif /* NM_DEVICE_PRIVATE_H */
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 94906224ac..633690ebd9 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -436,7 +436,7 @@ typedef struct _NMDevicePrivate {
};
NMIP6Config * con_ip6_config; /* config from the setting */
AppliedConfig wwan_ip6_config;
- AppliedConfig ac_ip6_config; /* config from IPv6 autoconfiguration */
+ AppliedConfig ac_ip6_config; /* config from IPv6 autoconfiguration */
NMIP6Config * ext_ip6_config; /* Stuff added outside NM */
NMIP6Config * ext_ip6_config_captured; /* Configuration captured from platform. */
GSList * vpn6_configs; /* VPNs which use this device */
@@ -10899,7 +10899,7 @@ start_ping (NMDevice *self,
priv->gw_ping.log_domain = log_domain;
priv->gw_ping.address = g_strdup (address);
priv->gw_ping.binary = g_strdup (binary);
- priv->gw_ping.deadline = timeout + 10; /* the proper termination is enforced by a timer */
+ priv->gw_ping.deadline = timeout + 10; /* the proper termination is enforced by a timer */
if (spawn_ping (self)) {
priv->gw_ping.watch = g_child_watch_add (priv->gw_ping.pid, ip_check_ping_watch_cb, self);
diff --git a/src/dhcp/nm-dhcp-dhclient.c b/src/dhcp/nm-dhcp-dhclient.c
index 74d920a8da..acb14a014e 100644
--- a/src/dhcp/nm-dhcp-dhclient.c
+++ b/src/dhcp/nm-dhcp-dhclient.c
@@ -439,19 +439,19 @@ dhclient_start (NMDhcpClient *client,
while (prefixes--)
g_ptr_array_add (argv, (gpointer) "-P");
}
- g_ptr_array_add (argv, (gpointer) "-sf"); /* Set script file */
+ g_ptr_array_add (argv, (gpointer) "-sf"); /* Set script file */
g_ptr_array_add (argv, (gpointer) nm_dhcp_helper_path);
if (pid_file) {
- g_ptr_array_add (argv, (gpointer) "-pf"); /* Set pid file */
+ g_ptr_array_add (argv, (gpointer) "-pf"); /* Set pid file */
g_ptr_array_add (argv, (gpointer) pid_file);
}
- g_ptr_array_add (argv, (gpointer) "-lf"); /* Set lease file */
+ g_ptr_array_add (argv, (gpointer) "-lf"); /* Set lease file */
g_ptr_array_add (argv, (gpointer) priv->lease_file);
if (priv->conf_file) {
- g_ptr_array_add (argv, (gpointer) "-cf"); /* Set interface config file */
+ g_ptr_array_add (argv, (gpointer) "-cf"); /* Set interface config file */
g_ptr_array_add (argv, (gpointer) priv->conf_file);
}
diff --git a/src/dhcp/nm-dhcp-dhcpcanon.c b/src/dhcp/nm-dhcp-dhcpcanon.c
index d7ddd1943a..a03f9d05b5 100644
--- a/src/dhcp/nm-dhcp-dhcpcanon.c
+++ b/src/dhcp/nm-dhcp-dhcpcanon.c
@@ -118,16 +118,16 @@ dhcpcanon_start (NMDhcpClient *client,
argv = g_ptr_array_new ();
g_ptr_array_add (argv, (gpointer) dhcpcanon_path);
- g_ptr_array_add (argv, (gpointer) "-sf"); /* Set script file */
+ g_ptr_array_add (argv, (gpointer) "-sf"); /* Set script file */
g_ptr_array_add (argv, (gpointer) nm_dhcp_helper_path);
if (pid_file) {
- g_ptr_array_add (argv, (gpointer) "-pf"); /* Set pid file */
+ g_ptr_array_add (argv, (gpointer) "-pf"); /* Set pid file */
g_ptr_array_add (argv, (gpointer) pid_file);
}
if (priv->conf_file) {
- g_ptr_array_add (argv, (gpointer) "-cf"); /* Set interface config file */
+ g_ptr_array_add (argv, (gpointer) "-cf"); /* Set interface config file */
g_ptr_array_add (argv, (gpointer) priv->conf_file);
}
diff --git a/src/dhcp/nm-dhcp-dhcpcd.c b/src/dhcp/nm-dhcp-dhcpcd.c
index 66a31acf10..7a18d88b67 100644
--- a/src/dhcp/nm-dhcp-dhcpcd.c
+++ b/src/dhcp/nm-dhcp-dhcpcd.c
@@ -114,18 +114,18 @@ ip4_start (NMDhcpClient *client, const char *dhcp_anycast_addr, const char *last
argv = g_ptr_array_new ();
g_ptr_array_add (argv, (gpointer) dhcpcd_path);
- g_ptr_array_add (argv, (gpointer) "-B"); /* Don't background on lease (disable fork()) */
+ g_ptr_array_add (argv, (gpointer) "-B"); /* Don't background on lease (disable fork()) */
- g_ptr_array_add (argv, (gpointer) "-K"); /* Disable built-in carrier detection */
+ g_ptr_array_add (argv, (gpointer) "-K"); /* Disable built-in carrier detection */
- g_ptr_array_add (argv, (gpointer) "-L"); /* Disable built-in IPv4LL */
+ g_ptr_array_add (argv, (gpointer) "-L"); /* Disable built-in IPv4LL */
/* --noarp. Don't request or claim the address by ARP; this also disables IPv4LL. */
g_ptr_array_add (argv, (gpointer) "-A");
- g_ptr_array_add (argv, (gpointer) "-G"); /* Let NM handle routing */
+ g_ptr_array_add (argv, (gpointer) "-G"); /* Let NM handle routing */
- g_ptr_array_add (argv, (gpointer) "-c"); /* Set script file */
+ g_ptr_array_add (argv, (gpointer) "-c"); /* Set script file */
g_ptr_array_add (argv, (gpointer) nm_dhcp_helper_path);
#ifdef DHCPCD_SUPPORTS_IPV6
diff --git a/src/nm-checkpoint.c b/src/nm-checkpoint.c
index 5bde924c27..476e27e71a 100644
--- a/src/nm-checkpoint.c
+++ b/src/nm-checkpoint.c
@@ -304,7 +304,7 @@ activate:
&local_error)) {
_LOGW ("rollback: reactivation of connection %s/%s failed: %s",
nm_connection_get_id ((NMConnection *) connection),
- nm_connection_get_uuid ((NMConnection * ) connection),
+ nm_connection_get_uuid ((NMConnection *) connection),
local_error->message);
g_clear_error (&local_error);
result = NM_ROLLBACK_RESULT_ERR_FAILED;
diff --git a/src/platform/wifi/wifi-utils-nl80211.c b/src/platform/wifi/wifi-utils-nl80211.c
index a2082b05d7..cdab00da57 100644
--- a/src/platform/wifi/wifi-utils-nl80211.c
+++ b/src/platform/wifi/wifi-utils-nl80211.c
@@ -404,7 +404,7 @@ struct nl80211_bss_info {
gboolean valid;
};
-#define WLAN_EID_SSID 0
+#define WLAN_EID_SSID 0
static void
find_ssid (guint8 *ies, guint32 ies_len,
diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c b/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c
index 8421afc202..014998a695 100644
--- a/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c
+++ b/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c
@@ -129,8 +129,8 @@ _recursive_ifparser (const char *eni_file, int quiet)
while (!feof(inp))
{
- char *token[128]; /* 255 chars can only be split into 127 tokens */
- char value[255]; /* large enough to join previously split tokens */
+ char *token[128]; /* 255 chars can only be split into 127 tokens */
+ char value[255]; /* large enough to join previously split tokens */
char *safeptr;
int toknum;
int len = 0;
@@ -169,7 +169,7 @@ _recursive_ifparser (const char *eni_file, int quiet)
continue;
}
-#define SPACES " \t"
+#define SPACES " \t"
/* tokenize input; */
for (toknum = 0, token[toknum] = strtok_r(line, SPACES, &safeptr);
token[toknum] != NULL;
diff --git a/src/supplicant/nm-supplicant-settings-verify.c b/src/supplicant/nm-supplicant-settings-verify.c
index d53a13c4b6..5198d75fb9 100644
--- a/src/supplicant/nm-supplicant-settings-verify.c
+++ b/src/supplicant/nm-supplicant-settings-verify.c
@@ -222,10 +222,10 @@ validate_type_keyword (const struct Opt * opt,
const char * value,
const guint32 len)
{
- char ** allowed;
- gchar ** candidates = NULL;
- char ** candidate;
- gboolean found = FALSE;
+ char **allowed;
+ gchar **candidates = NULL;
+ char **candidate;
+ gboolean found = FALSE;
g_return_val_if_fail (opt != NULL, FALSE);
g_return_val_if_fail (value != NULL, FALSE);
diff --git a/src/supplicant/nm-supplicant-types.h b/src/supplicant/nm-supplicant-types.h
index f75827ec60..747cf15274 100644
--- a/src/supplicant/nm-supplicant-types.h
+++ b/src/supplicant/nm-supplicant-types.h
@@ -21,9 +21,9 @@
#ifndef __NETWORKMANAGER_SUPPLICANT_TYPES_H__
#define __NETWORKMANAGER_SUPPLICANT_TYPES_H__
-#define WPAS_DBUS_SERVICE "fi.w1.wpa_supplicant1"
-#define WPAS_DBUS_PATH "/fi/w1/wpa_supplicant1"
-#define WPAS_DBUS_INTERFACE "fi.w1.wpa_supplicant1"
+#define WPAS_DBUS_SERVICE "fi.w1.wpa_supplicant1"
+#define WPAS_DBUS_PATH "/fi/w1/wpa_supplicant1"
+#define WPAS_DBUS_INTERFACE "fi.w1.wpa_supplicant1"
typedef struct _NMSupplicantManager NMSupplicantManager;
typedef struct _NMSupplicantInterface NMSupplicantInterface;