summaryrefslogtreecommitdiffstats
path: root/ospf6d/ospf6_intra.c
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2015-07-27 22:19:12 +0200
committerDonald Sharp <sharpd@cumulusnetworks.com>2015-07-27 22:19:12 +0200
commitee046671d35c550f594c2b3c1e611cdcf7c095fe (patch)
treeca86ba676a417ab36289c9ba76a001e8693bbb63 /ospf6d/ospf6_intra.c
parentUpdated .gitignore to ignore the files that are created when you build the de... (diff)
downloadfrr-ee046671d35c550f594c2b3c1e611cdcf7c095fe.tar.xz
frr-ee046671d35c550f594c2b3c1e611cdcf7c095fe.zip
Fixup compiler warnings for powerpc
The turn-on of -Werror was never run fully against powerpc. there were some powerpc specific issues that turned up. This commit fixes these issues.
Diffstat (limited to 'ospf6d/ospf6_intra.c')
-rw-r--r--ospf6d/ospf6_intra.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ospf6d/ospf6_intra.c b/ospf6d/ospf6_intra.c
index eafde433f..5494c4a32 100644
--- a/ospf6d/ospf6_intra.c
+++ b/ospf6d/ospf6_intra.c
@@ -243,9 +243,9 @@ ospf6_router_lsa_originate (struct thread *thread)
/* Multiple Router-LSA instance according to size limit setting */
if ( (oa->router_lsa_size_limit != 0)
- && ((caddr_t) lsdesc + sizeof (struct ospf6_router_lsdesc) -
- /* XXX warning: comparison between signed and unsigned */
- (caddr_t) buffer > oa->router_lsa_size_limit))
+ && ((size_t)((char *)lsdesc - buffer)
+ + sizeof (struct ospf6_router_lsdesc)
+ > oa->router_lsa_size_limit))
{
if ((caddr_t) lsdesc == (caddr_t) router_lsa +
sizeof (struct ospf6_router_lsa))