From e43ae6330eaf349eafe6820465c85266eef80e07 Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Sun, 19 Aug 2001 11:15:24 +0000 Subject: [PATCH] Fix %I format strings. --- nest/rt-table.c | 2 +- proto/ospf/dbdes.c | 2 +- proto/ospf/neighbor.c | 2 +- proto/ospf/ospf.c | 2 +- proto/ospf/topology.c | 2 +- proto/static/static.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nest/rt-table.c b/nest/rt-table.c index e095a14f..d313dbcf 100644 --- a/nest/rt-table.c +++ b/nest/rt-table.c @@ -538,7 +538,7 @@ rte_dump(rte *e) { net *n = e->net; if (n) - debug("%1I/%2d ", n->n.prefix, n->n.pxlen); + debug("%-1I/%2d ", n->n.prefix, n->n.pxlen); else debug("??? "); debug("KF=%02x PF=%02x pref=%d lm=%d ", n->n.flags, e->pflags, e->pref, now-e->lastmod); diff --git a/proto/ospf/dbdes.c b/proto/ospf/dbdes.c index d6aadb6f..05099b6a 100644 --- a/proto/ospf/dbdes.c +++ b/proto/ospf/dbdes.c @@ -88,7 +88,7 @@ ospf_dbdes_tx(struct ospf_neighbor *n) en=(struct top_hash_entry *)sn; htonlsah(&(en->lsa), lsa); DBG("Working on: %d\n", i); - DBG("\tX%01x %08I %08I %p\n", en->lsa.type, en->lsa.id, + DBG("\tX%01x %-1I %-1I %p\n", en->lsa.type, en->lsa.id, en->lsa.rt, en->lsa_body); if(sn==STAIL(n->ifa->oa->lsal)) diff --git a/proto/ospf/neighbor.c b/proto/ospf/neighbor.c index cbb3e5e1..52a94db4 100644 --- a/proto/ospf/neighbor.c +++ b/proto/ospf/neighbor.c @@ -545,6 +545,6 @@ ospf_sh_neigh_info(struct ospf_neighbor *n) if(n->rid==ifa->bdrid) pos="bdr "; if(n->ifa->type==OSPF_IT_PTP) pos="ptp "; - cli_msg(-1013,"%-18I\t%3u\t%s/%s\t%-5s\t%-18I\t%-10s",n->rid, n->priority, + cli_msg(-1013,"%-1I\t%3u\t%s/%s\t%-5s\t%-1I\t%-10s",n->rid, n->priority, ospf_ns[n->state], pos, etime, n->ip,ifa->iface->name); } diff --git a/proto/ospf/ospf.c b/proto/ospf/ospf.c index 23e668d8..7f48f015 100644 --- a/proto/ospf/ospf.c +++ b/proto/ospf/ospf.c @@ -836,7 +836,7 @@ ospf_sh(struct proto *p) cli_msg(-1014,"\t\tArea networks:"); WALK_LIST(anet, oa->net_list) { - cli_msg(-1014,"\t\t\t%18I/%u\t%s", anet->net, anet->mlen, + cli_msg(-1014,"\t\t\t%1I/%u\t%s", anet->net, anet->mlen, anet->hidden ? "Hidden" : "Advertise"); } } diff --git a/proto/ospf/topology.c b/proto/ospf/topology.c index f8a0d4ca..2dfe3acf 100644 --- a/proto/ospf/topology.c +++ b/proto/ospf/topology.c @@ -629,7 +629,7 @@ ospf_top_dump(struct top_graph *f, struct proto *p) struct top_hash_entry *e = f->hash_table[i]; while (e) { - OSPF_TRACE(D_EVENTS, "\t%1x %8I %8I %4u 0x%08x", + OSPF_TRACE(D_EVENTS, "\t%1x %-1I %-1I %4u 0x%08x", e->lsa.type, e->lsa.id, e->lsa.rt, e->lsa.age, e->lsa.sn); e = e->next; diff --git a/proto/static/static.c b/proto/static/static.c index eb6c1c11..c5324796 100644 --- a/proto/static/static.c +++ b/proto/static/static.c @@ -150,7 +150,7 @@ static_neigh_notify(struct neighbor *n) static void static_dump_rt(struct static_route *r) { - debug("%16I/%2d: ", r->net, r->masklen); + debug("%-1I/%2d: ", r->net, r->masklen); switch (r->dest) { case RTD_ROUTER: