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 b576893e056b882f21ced9ebd8b86b425350d717..fa3aada3afb33d06348e486cea20f25f55bae876 100644 (file)
--- 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 f97e685c091347ffc3539c0cb7c541b86144b911..9a55a4868a94ac2a3f512cc2ceb88334a03b6fb1 100644 (file)
--- 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 3f45f7fcdc03274fea07dd662cde3b12009dd7e7..ff2ea9ee88f67fab9f61cfaba8b2ca2d41e61f2a 100644 (file)
--- 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 06ff40105d9716c5752eb7b2d7eb8d95a81f46f5..125fafd3d81f75283c59b6d7ac6ad8b0dcdf6543 100644 (file)
--- 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 34aeb365cf107ac4cb176dc18df90c130efe95d2..32c08b5c1f5ba52c93c31e260330969822b3f1cf 100644 (file)
--- 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 52a463d150038fc04899393ff26a39f7c4f05070..2a01f8fe214d2328f5866f7fad9c3f3094bc6818 100644 (file)
--- 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 d47c983bbe44892750859ebfaf7e6fe5b54a0f71..cfb526ef6a54f417f4944c6e2169c84fb06a5430 100644 (file)
--- 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