summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2017-03-14 11:15:05 +0100
committerThomas Haller <thaller@redhat.com>2017-03-14 11:26:29 +0100
commit22b7282d843f24442aed6a72617e0038f572b2c9 (patch)
treefd8b8fef15a9446dbe3419af2513a05fa276d1a5
parentb1eeb009371251d5a8115bfb16fac1d1504e5a90 (diff)
downloadNetworkManager-22b7282d843f24442aed6a72617e0038f572b2c9.tar.gz
all: use "unsigned" instead of "unsigned int"
-rw-r--r--clients/cli/common.c2
-rw-r--r--clients/cli/connections.c2
-rw-r--r--clients/tui/nm-editor-utils.c2
-rw-r--r--configure.ac4
-rw-r--r--libnm-core/crypto_nss.c2
-rw-r--r--libnm-core/nm-setting-tun.c2
-rw-r--r--libnm-util/crypto_nss.c4
-rw-r--r--src/devices/wifi/nm-device-wifi.c2
-rw-r--r--src/platform/nm-linux-platform.c2
-rw-r--r--src/platform/nm-platform-utils.c6
10 files changed, 14 insertions, 14 deletions
diff --git a/clients/cli/common.c b/clients/cli/common.c
index c46f6c27e6..327804fbc6 100644
--- a/clients/cli/common.c
+++ b/clients/cli/common.c
@@ -1294,7 +1294,7 @@ nmc_unique_connection_name (const GPtrArray *connections, const char *try_name)
NMConnection *connection;
const char *name;
char *new_name;
- unsigned int num = 1;
+ unsigned num = 1;
int i = 0;
new_name = g_strdup (try_name);
diff --git a/clients/cli/connections.c b/clients/cli/connections.c
index fd2b7e7232..84cde2b78c 100644
--- a/clients/cli/connections.c
+++ b/clients/cli/connections.c
@@ -3555,7 +3555,7 @@ unique_master_iface_ifname (const GPtrArray *connections,
{
NMConnection *connection;
char *new_name;
- unsigned int num = 1;
+ unsigned num = 1;
int i = 0;
const char *ifname = NULL;
diff --git a/clients/tui/nm-editor-utils.c b/clients/tui/nm-editor-utils.c
index 210542d2f0..b71e9fbed6 100644
--- a/clients/tui/nm-editor-utils.c
+++ b/clients/tui/nm-editor-utils.c
@@ -323,7 +323,7 @@ get_available_iface_name (const char *try_name,
const GPtrArray *connections;
NMConnection *connection;
char *new_name;
- unsigned int num = 1;
+ unsigned num = 1;
int i = 0;
const char *ifname = NULL;
diff --git a/configure.ac b/configure.ac
index e21bf09f23..3af9c4a22c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -239,7 +239,7 @@ if test "$with_wifi" = "yes"; then
#include <linux/types.h>
#include <sys/socket.h>
#include <linux/nl80211.h>]],
- [[unsigned int a = NL80211_CMD_CRIT_PROTOCOL_START; a++;]])],
+ [[unsigned a = NL80211_CMD_CRIT_PROTOCOL_START; a++;]])],
[ac_have_nl80211_critproto=yes],
[ac_have_nl80211_critproto=no])
AC_MSG_RESULT($ac_have_nl80211_critproto)
@@ -264,7 +264,7 @@ AC_COMPILE_IFELSE(
#include <sys/types.h>
#include <linux/types.h>
#include <linux/if_vlan.h>]],
- [[unsigned int a = VLAN_FLAG_LOOSE_BINDING;]])],
+ [[unsigned a = VLAN_FLAG_LOOSE_BINDING;]])],
[ac_have_vlan_flag_loose_binding=yes],
[ac_have_vlan_flag_loose_binding=no])
AC_MSG_RESULT($ac_have_vlan_flag_loose_binding)
diff --git a/libnm-core/crypto_nss.c b/libnm-core/crypto_nss.c
index b5d7e63023..56e91e26fc 100644
--- a/libnm-core/crypto_nss.c
+++ b/libnm-core/crypto_nss.c
@@ -91,7 +91,7 @@ crypto_decrypt (const char *cipher,
PK11Context *ctx = NULL;
SECStatus s;
gboolean success = FALSE;
- unsigned int pad_len = 0, extra = 0;
+ unsigned pad_len = 0, extra = 0;
guint32 i, real_iv_len = 0;
if (!crypto_init (error))
diff --git a/libnm-core/nm-setting-tun.c b/libnm-core/nm-setting-tun.c
index fe14eec286..62e9ef145f 100644
--- a/libnm-core/nm-setting-tun.c
+++ b/libnm-core/nm-setting-tun.c
@@ -184,7 +184,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
g_set_error (error,
NM_CONNECTION_ERROR,
NM_CONNECTION_ERROR_INVALID_PROPERTY,
- _("'%u': invalid mode"), (unsigned int) priv->mode);
+ _("'%u': invalid mode"), (unsigned) priv->mode);
g_prefix_error (error, "%s.%s: ", NM_SETTING_TUN_SETTING_NAME, NM_SETTING_TUN_MODE);
return FALSE;
}
diff --git a/libnm-util/crypto_nss.c b/libnm-util/crypto_nss.c
index 4e60d2e954..b55af774ec 100644
--- a/libnm-util/crypto_nss.c
+++ b/libnm-util/crypto_nss.c
@@ -79,7 +79,7 @@ crypto_md5_hash (const char *salt,
{
PK11Context *ctx;
int nkey = buflen;
- unsigned int digest_len;
+ unsigned digest_len;
int count = 0;
char digest[MD5_HASH_LEN];
char *p = buffer;
@@ -144,7 +144,7 @@ crypto_decrypt (const char *cipher,
PK11Context *ctx = NULL;
SECStatus s;
gboolean success = FALSE;
- unsigned int pad_len = 0, extra = 0;
+ unsigned pad_len = 0, extra = 0;
guint32 i, real_iv_len = 0;
if (!strcmp (cipher, CIPHER_DES_EDE3_CBC)) {
diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
index a02bb09999..1ebefd9074 100644
--- a/src/devices/wifi/nm-device-wifi.c
+++ b/src/devices/wifi/nm-device-wifi.c
@@ -2551,7 +2551,7 @@ set_powersave (NMDevice *device)
NM_SETTING_WIRELESS_POWERSAVE_IGNORE);
}
- _LOGT (LOGD_WIFI, "powersave is set to %u", (unsigned int) powersave);
+ _LOGT (LOGD_WIFI, "powersave is set to %u", (unsigned) powersave);
if (powersave == NM_SETTING_WIRELESS_POWERSAVE_IGNORE)
return;
diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
index ab17b6415a..efb4221f0a 100644
--- a/src/platform/nm-linux-platform.c
+++ b/src/platform/nm-linux-platform.c
@@ -4738,7 +4738,7 @@ vlan_add (NMPlatform *platform,
vlan_flags &= (guint32) NM_VLAN_FLAGS_ALL;
_LOGD ("link: add vlan '%s', parent %d, vlan id %d, flags %X",
- name, parent, vlan_id, (unsigned int) vlan_flags);
+ name, parent, vlan_id, (unsigned) vlan_flags);
nlmsg = _nl_msg_new_link (RTM_NEWLINK,
NLM_F_CREATE | NLM_F_EXCL,
diff --git a/src/platform/nm-platform-utils.c b/src/platform/nm-platform-utils.c
index 65fb01bc2c..80aa4445db 100644
--- a/src/platform/nm-platform-utils.c
+++ b/src/platform/nm-platform-utils.c
@@ -42,8 +42,8 @@
* utils
******************************************************************/
-extern char *if_indextoname (unsigned int __ifindex, char *__ifname);
-unsigned int if_nametoindex (const char *__ifname);
+extern char *if_indextoname (unsigned __ifindex, char *__ifname);
+unsigned if_nametoindex (const char *__ifname);
const char *
nmp_utils_if_indextoname (int ifindex, char *out_ifname/*IFNAMSIZ*/)
@@ -440,7 +440,7 @@ nmp_utils_ethtool_set_wake_on_lan (int ifindex,
return TRUE;
nm_log_dbg (LOGD_PLATFORM, "setting Wake-on-LAN options 0x%x, password '%s'",
- (unsigned int) wol, wol_password);
+ (unsigned) wol, wol_password);
wol_info.cmd = ETHTOOL_SWOL;
wol_info.wolopts = 0;