From 0287086fa78f0bc0012325c2eadb3dccb6b1f766 Mon Sep 17 00:00:00 2001 From: Perry Ruiter Date: Mon, 31 Mar 2014 04:42:22 -0700 Subject: [PATCH] afs: Suppress duplicate message on Linux Update afs_util.c to call afs_warnall in places where afs_warn and afs_warnuser are called back to back with identical parameters. Change-Id: I529344dea12149d8f18ec38bb17418c703f7d26b Reviewed-on: http://gerrit.openafs.org/11006 Reviewed-by: Chas Williams - CONTRACTOR Tested-by: BuildBot Reviewed-by: D Brashear --- src/afs/afs_util.c | 14 ++------------ 1 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/afs/afs_util.c b/src/afs/afs_util.c index bd40616..dcf4d99 100644 --- a/src/afs/afs_util.c +++ b/src/afs/afs_util.c @@ -214,12 +214,9 @@ print_internet_address(char *preamble, struct srvAddr *sa, char *postamble, " (multi-homed address; other same-host interfaces may still be down)\n"; } } - afs_warn("%s%d.%d.%d.%d in cell %s%s (code %d)%s", preamble, (address >> 24), + afs_warnall("%s%d.%d.%d.%d in cell %s%s (code %d)%s", preamble, (address >> 24), (address >> 16) & 0xff, (address >> 8) & 0xff, (address) & 0xff, aserver->cell->cellName, postamble, code, ptr); - afs_warnuser("%s%d.%d.%d.%d in cell %s%s (code %d)%s", preamble, (address >> 24), - (address >> 16) & 0xff, (address >> 8) & 0xff, - (address) & 0xff, aserver->cell->cellName, postamble, code, ptr); if (flag == 1 && rxconn) { /* server was marked down, check Rx to see if this was possibly due to @@ -232,14 +229,7 @@ print_internet_address(char *preamble, struct srvAddr *sa, char *postamble, if (!errmsg) { errmsg = str1 = str2 = ""; } - afs_warn("afs: network error for %d.%d.%d.%d:%d: origin %d type %d code %d%s%s%s\n", - (address >> 24), - (address >> 16) & 0xff, - (address >> 8) & 0xff, - (address) & 0xff, - (int)ntohs(sa->sa_portal), - errorigin, errtype, errcode, str1, errmsg, str2); - afs_warnuser("afs: network error for %d.%d.%d.%d:%d: origin %d type %d code %d%s%s%s\n", + afs_warnall("afs: network error for %d.%d.%d.%d:%d: origin %d type %d code %d%s%s%s\n", (address >> 24), (address >> 16) & 0xff, (address >> 8) & 0xff, -- 1.7.1