summaryrefslogtreecommitdiffstats
path: root/isisd
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@opensourcerouting.org>2015-04-10 09:10:11 +0200
committerDonald Sharp <sharpd@cumulusnetworks.com>2016-06-07 15:13:23 +0200
commit7b7a77a601fef2ee5ba356a3d973f18a6c7289d2 (patch)
tree442cc48d84c191572ea818985928e74d0d4c5120 /isisd
parentisisd: assorted fixes (unused variables, static) (diff)
downloadfrr-7b7a77a601fef2ee5ba356a3d973f18a6c7289d2.tar.xz
frr-7b7a77a601fef2ee5ba356a3d973f18a6c7289d2.zip
isisd: fix size_t confusions
isisd had a few places that mixed up size_t vs. unsigned long, and %zd vs. %ld. Clean out. Signed-off-by: David Lamparter <equinox@opensourcerouting.org> (cherry picked from commit 01da6176b88fe59b3c6ceaf3630df88046c83159)
Diffstat (limited to 'isisd')
-rw-r--r--isisd/isis_pdu.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/isisd/isis_pdu.c b/isisd/isis_pdu.c
index aa5f3552c..0401e44a9 100644
--- a/isisd/isis_pdu.c
+++ b/isisd/isis_pdu.c
@@ -2271,7 +2271,7 @@ send_hello (struct isis_circuit *circuit, int level)
struct isis_lan_hello_hdr hello_hdr;
struct isis_p2p_hello_hdr p2p_hello_hdr;
unsigned char hmac_md5_hash[ISIS_AUTH_MD5_SIZE];
- unsigned long len_pointer, length, auth_tlv_offset = 0;
+ size_t len_pointer, length, auth_tlv_offset = 0;
u_int32_t interval;
int retval;
@@ -2426,16 +2426,14 @@ send_hello (struct isis_circuit *circuit, int level)
{
if (circuit->circ_type == CIRCUIT_T_BROADCAST)
{
- zlog_debug ("ISIS-Adj (%s): Sending L%d LAN IIH on %s, length %ld",
+ zlog_debug ("ISIS-Adj (%s): Sending L%d LAN IIH on %s, length %zd",
circuit->area->area_tag, level, circuit->interface->name,
- /* FIXME: use %z when we stop supporting old compilers. */
length);
}
else
{
- zlog_debug ("ISIS-Adj (%s): Sending P2P IIH on %s, length %ld",
+ zlog_debug ("ISIS-Adj (%s): Sending P2P IIH on %s, length %zd",
circuit->area->area_tag, circuit->interface->name,
- /* FIXME: use %z when we stop supporting old compilers. */
length);
}
if (isis->debugs & DEBUG_PACKET_DUMP)