From eda9ba743c1eb7c32b2ae9b8989d3555f1890758 Mon Sep 17 00:00:00 2001
From: "Andrew J. Schorr" <ajschorr@alumni.princeton.edu>
Date: Fri, 27 Apr 2007 18:13:15 +0000
Subject: [64-bit] Fix 4 problems with printf formats and 64-bit size_t
2007-04-27 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* lib/smux.c: (smux_trap) Fix printf format to work with 64-bit size_t.
* ospf6d/ospf6_snmp.c: (ospfv3AreaEntry, ospfv3AreaLsdbEntry) Fix some
zlog_debug printf formats to work with 64-bit size_t.
---
ospf6d/ChangeLog | 5 +++++
ospf6d/ospf6_snmp.c | 12 ++++++------
2 files changed, 11 insertions(+), 6 deletions(-)
(limited to 'ospf6d')
diff --git a/ospf6d/ChangeLog b/ospf6d/ChangeLog
index c5f24f7f..4d55a590 100644
--- a/ospf6d/ChangeLog
+++ b/ospf6d/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-27 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
+ * ospf6_snmp.c: (ospfv3AreaEntry, ospfv3AreaLsdbEntry) Fix some
+ zlog_debug printf formats to work with 64-bit size_t.
+
2007-03-08 David Siebörger d.sieborger@ru.ac.za
* ospf6_neighbor.c: (ospf6_neighbor_show) Fix bug #322, ospf6d
diff --git a/ospf6d/ospf6_snmp.c b/ospf6d/ospf6_snmp.c
index 09fa27ce..a1d8d4c9 100644
--- a/ospf6d/ospf6_snmp.c
+++ b/ospf6d/ospf6_snmp.c
@@ -314,9 +314,9 @@ ospfv3AreaEntry (struct variable *v, oid *name, size_t *length,
if (len)
oid2in_addr (name + v->namelen, len, (struct in_addr *) &area_id);
- zlog_debug ("SNMP access by area: %s, exact=%d len=%d length=%d",
+ zlog_debug ("SNMP access by area: %s, exact=%d len=%d length=%lu",
inet_ntoa (* (struct in_addr *) &area_id),
- exact, len, *length);
+ exact, len, (u_long)*length);
for (ALL_LIST_ELEMENTS_RO (ospf6->area_list, node, oa))
{
@@ -338,9 +338,9 @@ ospfv3AreaEntry (struct variable *v, oid *name, size_t *length,
oid_copy_addr (name + v->namelen, (struct in_addr *) &area->area_id,
sizeof (u_int32_t));
- zlog_debug ("SNMP found area: %s, exact=%d len=%d length=%d",
+ zlog_debug ("SNMP found area: %s, exact=%d len=%d length=%lu",
inet_ntoa (* (struct in_addr *) &area->area_id),
- exact, len, *length);
+ exact, len, (u_long)*length);
switch (v->magic)
{
@@ -423,9 +423,9 @@ ospfv3AreaLsdbEntry (struct variable *v, oid *name, size_t *length,
inet_ntop (AF_INET, &area_id, a, sizeof (a));
inet_ntop (AF_INET, &adv_router, b, sizeof (b));
inet_ntop (AF_INET, &id, c, sizeof (c));
- zlog_debug ("SNMP access by lsdb: area=%s exact=%d length=%d magic=%d"
+ zlog_debug ("SNMP access by lsdb: area=%s exact=%d length=%lu magic=%d"
" type=%#x adv_router=%s id=%s",
- a, exact, *length, v->magic, ntohs (type), b, c);
+ a, exact, (u_long)*length, v->magic, ntohs (type), b, c);
if (exact)
{
--
cgit v1.2.1