summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2015-07-29 19:16:13 -0400
committerPaul Jakma <paul@quagga.net>2015-09-24 15:26:44 +0100
commit0bc874b88cf86fca4b18f3672a441ed142fc499d (patch)
tree35781fe9f0d71c7df85fe07c3461553eb4901215
parentfbc3e97d747862fd47f711c9f15b8166bdf94b18 (diff)
downloadquagga-0bc874b88cf86fca4b18f3672a441ed142fc499d.tar.bz2
quagga-0bc874b88cf86fca4b18f3672a441ed142fc499d.tar.xz
build/arm: Arm compilation warning fix
The arm cross compiler is issuing warnings for signed/unsigned comparisons for ntohs. ntohs returns a unsigned int, while the counting variables are signed. Fixed to allow -Werror to work properly Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
-rw-r--r--ospf6d/ospf6_message.c2
-rw-r--r--ospfd/ospf_interface.c2
-rw-r--r--ospfd/ospf_vty.c3
3 files changed, 4 insertions, 3 deletions
diff --git a/ospf6d/ospf6_message.c b/ospf6d/ospf6_message.c
index ecc96f71..e71b4101 100644
--- a/ospf6d/ospf6_message.c
+++ b/ospf6d/ospf6_message.c
@@ -1630,7 +1630,7 @@ static void
ospf6_send (struct in6_addr *src, struct in6_addr *dst,
struct ospf6_interface *oi, struct ospf6_header *oh)
{
- int len;
+ unsigned int len;
char srcname[64], dstname[64];
struct iovec iovector[2];
diff --git a/ospfd/ospf_interface.c b/ospfd/ospf_interface.c
index af4f0a60..f41c4f16 100644
--- a/ospfd/ospf_interface.c
+++ b/ospfd/ospf_interface.c
@@ -1011,7 +1011,7 @@ ospf_vl_set_params (struct ospf_vl_data *vl_data, struct vertex *v)
struct ospf_interface *voi;
struct listnode *node;
struct vertex_parent *vp = NULL;
- int i;
+ unsigned int i;
struct router_lsa *rl;
voi = vl_data->vl_oi;
diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index e5e56319..c6f3b404 100644
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -3694,7 +3694,8 @@ static void
show_ip_ospf_database_router_links (struct vty *vty,
struct router_lsa *rl)
{
- int len, i, type;
+ int len, type;
+ unsigned int i;
len = ntohs (rl->header.length) - 4;
for (i = 0; i < ntohs (rl->links) && len > 0; len -= 12, i++)