From df49d4e14b7c24f8ca958870fd1e9ddc84df1f1b Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Sun, 4 Jun 2000 19:56:06 +0000 Subject: Removed lots of trailing newlines in log messages. Please note that the only calls which don't add newlines automatically (i.e., don't print a full line of output) are debug() and DBG(). --- proto/ospf/dbdes.c | 4 ++-- proto/ospf/hello.c | 10 +++++----- proto/ospf/iface.c | 4 ++-- proto/ospf/lsack.c | 2 +- proto/ospf/lsalib.c | 4 ++-- proto/ospf/lsupd.c | 12 ++++++------ proto/ospf/neighbor.c | 6 +++--- proto/ospf/rt.c | 4 ++-- 8 files changed, 23 insertions(+), 23 deletions(-) (limited to 'proto/ospf') diff --git a/proto/ospf/dbdes.c b/proto/ospf/dbdes.c index 44fc459..ef297be 100644 --- a/proto/ospf/dbdes.c +++ b/proto/ospf/dbdes.c @@ -133,7 +133,7 @@ ospf_dbdes_tx(struct ospf_neighbor *n) break; default: /* Ignore it */ - die("Bug in dbdes sending\n"); + die("Bug in dbdes sending"); break; } } @@ -358,7 +358,7 @@ ospf_dbdes_rx(struct ospf_dbdes_packet *ps, struct proto *p, } break; defaut: - die("%s: Received dbdes from %I in unknown state.\n", p->name, n->ip); + die("%s: Received dbdes from %I in unknown state.", p->name, n->ip); break; } } diff --git a/proto/ospf/hello.c b/proto/ospf/hello.c index 18e1561..3e4bfff 100644 --- a/proto/ospf/hello.c +++ b/proto/ospf/hello.c @@ -62,32 +62,32 @@ ospf_hello_rx(struct ospf_hello_packet *ps, struct proto *p, if((unsigned)ipa_mklen(ipa_ntoh(ps->netmask))!=ifa->iface->addr->pxlen) { - log("%s%s%I%s%Ibad netmask %I.\n", p->name, beg, nrid, rec, + log("%s%s%I%s%Ibad netmask %I.", p->name, beg, nrid, rec, ipa_ntoh(ps->netmask)); return; } if(ntohs(ps->helloint)!=ifa->helloint) { - log("%s%s%I%shello interval mismatch.\n", p->name, beg, faddr, rec); + log("%s%s%I%shello interval mismatch.", p->name, beg, faddr, rec); return; } if(ntohl(ps->deadint)!=ifa->helloint*ifa->deadc) { - log("%s%s%I%sdead interval mismatch.\n", p->name, beg, faddr, rec); + log("%s%s%I%sdead interval mismatch.", p->name, beg, faddr, rec); return; } if(ps->options!=ifa->options) { - log("%s%s%I%soptions mismatch.\n", p->name, beg, faddr, rec); + log("%s%s%I%soptions mismatch.", p->name, beg, faddr, rec); return; } if((n=find_neigh(ifa, nrid))==NULL) { - debug("%s: New neighbor found: %I on %s.\n", p->name,faddr, + debug("%s: New neighbor found: %I on %s.", p->name,faddr, ifa->iface->name); n=mb_allocz(p->pool, sizeof(struct ospf_neighbor)); add_tail(&ifa->neigh_list, NODE n); diff --git a/proto/ospf/iface.c b/proto/ospf/iface.c index 011fd4b..f7be7eb 100644 --- a/proto/ospf/iface.c +++ b/proto/ospf/iface.c @@ -362,7 +362,7 @@ ospf_if_notify(struct proto *p, unsigned flags, struct iface *iface) log("%s: Huh? could not open mc socket on interface %s?", p->name, iface->name); mb_free(ifa); - log("%s: Ignoring this interface\n", p->name); + log("%s: Ignoring this interface.", p->name); return; } ifa->dr_sk=NULL; @@ -372,7 +372,7 @@ ospf_if_notify(struct proto *p, unsigned flags, struct iface *iface) log("%s: Huh? could not open ip socket on interface %s?", p->name, iface->name); mb_free(ifa); - log("%s: Ignoring this interface\n", p->name); + log("%s: Ignoring this interface", p->name); return; } diff --git a/proto/ospf/lsack.c b/proto/ospf/lsack.c index 16166db..a9853f4 100644 --- a/proto/ospf/lsack.c +++ b/proto/ospf/lsack.c @@ -178,7 +178,7 @@ ospf_lsack_rx(struct ospf_lsack_packet *ps, struct proto *p, if((nolsa<1)||((lenn-sizeof(struct ospf_lsack_packet))!= (nolsa*sizeof(struct ospf_lsa_header)))) { - log("%s: Received corrupted LS ack from %I\n", p->name, n->ip); + log("%s: Received corrupted LS ack from %I", p->name, n->ip); return; } diff --git a/proto/ospf/lsalib.c b/proto/ospf/lsalib.c index 9cfddc0..14ad099 100644 --- a/proto/ospf/lsalib.c +++ b/proto/ospf/lsalib.c @@ -172,7 +172,7 @@ htonlsab(void *h, void *n, u8 type, u16 len) } break; } - default: die("(hton): Unknown LSA\n"); + default: die("(hton): Unknown LSA"); } }; @@ -269,7 +269,7 @@ ntohlsab(void *n, void *h, u8 type, u16 len) } break; } - default: die("(ntoh): Unknown LSA\n"); + default: die("(ntoh): Unknown LSA"); } }; diff --git a/proto/ospf/lsupd.c b/proto/ospf/lsupd.c index 90a7b7d..ad64eed 100644 --- a/proto/ospf/lsupd.c +++ b/proto/ospf/lsupd.c @@ -64,7 +64,7 @@ flood_lsa(struct ospf_neighbor *n, struct ospf_lsa_header *hn, ospf_hash_delete(nn->lsrqh,en); if(EMPTY_SLIST(nn->lsrql)) ospf_neigh_sm(nn, INM_LOADDONE); break; - default: bug("Bug in lsa_comp?\n"); + default: bug("Bug in lsa_comp?"); } } } @@ -279,32 +279,32 @@ ospf_lsupd_rx(struct ospf_lsupd_packet *ps, struct proto *p, if(((diff+sizeof(struct ospf_lsa_header))>=size) || ((ntohs(lsa->length)+diff)>size)) - log("%s: Received lsupd from %I is too short.\n", p->name,n->ip); + log("%s: Received lsupd from %I is too short.", p->name,n->ip); lenn=ntohs(lsa->length); if((lenn<=sizeof(struct ospf_lsa_header))||(lenn!=(4*(lenn/4)))) { - log("Received LSA with bad length\n"); + log("Received LSA with bad length"); ospf_neigh_sm(n,INM_BADLSREQ); break; } /* pg 143 (1) */ if(lsa->checksum!=lsasum_check(lsa,NULL,po)) { - log("Received bad lsa checksum from %I\n",n->rid); + log("Received bad lsa checksum from %I",n->rid); continue; } /* pg 143 (2) */ if((lsa->typetype>LSA_T_EXT)) { - log("Unknown LSA type from %I\n",n->rid); + log("Unknown LSA type from %I",n->rid); continue; } /* pg 143 (3) */ if((lsa->type==LSA_T_EXT)&&oa->stub) { - log("Received External LSA in stub area from %I\n",n->rid); + log("Received External LSA in stub area from %I",n->rid); continue; } ntohlsah(lsa,&lsatmp); diff --git a/proto/ospf/neighbor.c b/proto/ospf/neighbor.c index 3590504..9e04bac 100644 --- a/proto/ospf/neighbor.c +++ b/proto/ospf/neighbor.c @@ -249,7 +249,7 @@ ospf_neigh_sm(struct ospf_neighbor *n, int event) tm_start(n->lsrr_timer,n->ifa->rxmtint); tm_start(n->ackd_timer,n->ifa->rxmtint/2); } - else die("NEGDONE and I'm not in EXSTART?\n"); + else die("NEGDONE and I'm not in EXSTART?"); break; case INM_EXDONE: neigh_chstate(n,NEIGHBOR_LOADING); @@ -358,7 +358,7 @@ bdr_election(struct ospf_iface *ifa, struct proto *p) else { if((tmp=find_neigh(ifa,ndrid))==NULL) - die("Error in DR election.\n"); + die("Error in DR election."); ifa->drid=ndrid; ifa->drip=tmp->ip; } @@ -371,7 +371,7 @@ bdr_election(struct ospf_iface *ifa, struct proto *p) else { if((tmp=find_neigh(ifa,nbdrid))==NULL) - die("Error in BDR election.\n"); + die("Error in BDR election."); ifa->bdrid=nbdrid; ifa->bdrip=tmp->ip; } diff --git a/proto/ospf/rt.c b/proto/ospf/rt.c index d9e7094..86379e4 100644 --- a/proto/ospf/rt.c +++ b/proto/ospf/rt.c @@ -127,7 +127,7 @@ ospf_rt_spfa(struct ospf_area *oa) DBG("PTP searched.\n"); break; default: - log("Unknown link type in router lsa.\n"); + log("Unknown link type in router lsa."); break; } add_cand(&oa->cand,tmp,act,act->dist+rtl->metric,oa); @@ -287,7 +287,7 @@ ospf_ext_spfa(struct proto_ospf *po) /* FIXME looking into inter-area */ mlen=ipa_mklen(le->netmask); if((mlen<0)||(mlen>32)) { - log("%s: Invalid mask in LSA.\nID: %I, RT: %I, Type: %u, Mask %I", + log("%s: Invalid mask in LSA. ID: %I, RT: %I, Type: %u, Mask %I", p->name,en->lsa.id,en->lsa.rt,en->lsa.type,le->netmask); continue; } -- cgit v1.2.3