From: Stéphane Graber <stgraber@ubuntu.com>
Date: Tue, 8 Jan 2013 17:02:53 +0000 (-0500)
Subject: Replace all reference to ushort by unsigned short
X-Git-Tag: lxc-0.9.0.alpha3~1^2~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c11d57a22668c838ecec57372a3534b5c956400;p=thirdparty%2Flxc.git

Replace all reference to ushort by unsigned short

ushort appears to be a glibc specific type which doesn't exist in
bionic, this commit simply replace all occurences by the equivalent
unsigned short type.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/lxc/conf.h b/src/lxc/conf.h
index b576893e0..fa3aada3a 100644
--- a/src/lxc/conf.h
+++ b/src/lxc/conf.h
@@ -87,8 +87,8 @@ struct ifla_veth {
 struct ifla_vlan {
 	uint   flags;
 	uint   fmask;
-	ushort   vid;
-	ushort   pad;
+	unsigned short   vid;
+	unsigned short   pad;
 };
 
 struct ifla_macvlan {
diff --git a/src/lxc/network.c b/src/lxc/network.c
index f97e685c0..9a55a4868 100644
--- a/src/lxc/network.c
+++ b/src/lxc/network.c
@@ -413,7 +413,7 @@ out:
 }
 
 /* XXX: merge with lxc_macvlan_create */
-int lxc_vlan_create(const char *master, const char *name, ushort vlanid)
+int lxc_vlan_create(const char *master, const char *name, unsigned short vlanid)
 {
 	struct nl_handler nlh;
 	struct nlmsg *nlmsg = NULL, *answer = NULL;
diff --git a/src/lxc/network.h b/src/lxc/network.h
index 3f45f7fcd..ff2ea9ee8 100644
--- a/src/lxc/network.h
+++ b/src/lxc/network.h
@@ -61,7 +61,7 @@ extern int lxc_netdev_set_mtu(const char *name, int mtu);
  */
 extern int lxc_veth_create(const char *name1, const char *name2);
 extern int lxc_macvlan_create(const char *master, const char *name, int mode);
-extern int lxc_vlan_create(const char *master, const char *name, ushort vid);
+extern int lxc_vlan_create(const char *master, const char *name, unsigned short vid);
 
 /*
  * Activate forwarding
diff --git a/src/lxc/nl.c b/src/lxc/nl.c
index 06ff40105..125fafd3d 100644
--- a/src/lxc/nl.c
+++ b/src/lxc/nl.c
@@ -79,7 +79,7 @@ extern int nla_put_u32(struct nlmsg *nlmsg, int attr, int value)
 	return nla_put(nlmsg, attr, &value, sizeof(value));
 }
 
-extern int nla_put_u16(struct nlmsg *nlmsg, int attr, ushort value)
+extern int nla_put_u16(struct nlmsg *nlmsg, int attr, unsigned short value)
 {
 	return nla_put(nlmsg, attr, &value, 2);
 }
diff --git a/src/lxc/nl.h b/src/lxc/nl.h
index 34aeb365c..32c08b5c1 100644
--- a/src/lxc/nl.h
+++ b/src/lxc/nl.h
@@ -169,7 +169,7 @@ int nla_put_u32(struct nlmsg *nlmsg, int attr, int value);
  *
  * Returns 0 on success, < 0 otherwise
  */
-int nla_put_u16(struct nlmsg *nlmsg, int attr, ushort value);
+int nla_put_u16(struct nlmsg *nlmsg, int attr, unsigned short value);
 
 /*
  * nla_put_attr: add an attribute name to a netlink
diff --git a/src/lxc/utils.c b/src/lxc/utils.c
index 52a463d15..2a01f8fe2 100644
--- a/src/lxc/utils.c
+++ b/src/lxc/utils.c
@@ -149,7 +149,7 @@ extern int lxc_setup_fs(void)
 }
 
 /* borrowed from iproute2 */
-extern int get_u16(ushort *val, const char *arg, int base)
+extern int get_u16(unsigned short *val, const char *arg, int base)
 {
 	unsigned long res;
 	char *ptr;
diff --git a/src/lxc/utils.h b/src/lxc/utils.h
index d47c983bb..cfb526ef6 100644
--- a/src/lxc/utils.h
+++ b/src/lxc/utils.h
@@ -25,7 +25,7 @@
 
 extern int lxc_copy_file(const char *src, const char *dst);
 extern int lxc_setup_fs(void);
-extern int get_u16(ushort *val, const char *arg, int base);
+extern int get_u16(unsigned short *val, const char *arg, int base);
 extern int mkdir_p(const char *dir, mode_t mode);
 
 #endif