From: Guy Harris <guy@alum.mit.edu>
Date: Thu, 17 Sep 2015 19:19:22 +0000 (-0700)
Subject: Rename variable to avoid collision with poll().
X-Git-Tag: tcpdump-4.8.0~131
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/1af4cb9ad8b07bb745050e2325afe2ef56bb470c?ds=inline

Rename variable to avoid collision with poll().

That eliminates some compiler warnings.
---

diff --git a/print-pgm.c b/print-pgm.c
index 6b02d34e..ddba527f 100644
--- a/print-pgm.c
+++ b/print-pgm.c
@@ -274,14 +274,14 @@ pgm_print(netdissect_options *ndo,
 	}
 
 	case PGM_POLL: {
-	    const struct pgm_poll *poll;
+	    const struct pgm_poll *poll_msg;
 
-	    poll = (const struct pgm_poll *)(pgm + 1);
-	    ND_TCHECK(*poll);
+	    poll_msg = (const struct pgm_poll *)(pgm + 1);
+	    ND_TCHECK(*poll_msg);
 	    ND_PRINT((ndo, "POLL seq %u round %u",
-			 EXTRACT_32BITS(&poll->pgmp_seq),
-                         EXTRACT_16BITS(&poll->pgmp_round)));
-	    bp = (const u_char *) (poll + 1);
+			 EXTRACT_32BITS(&poll_msg->pgmp_seq),
+                         EXTRACT_16BITS(&poll_msg->pgmp_round)));
+	    bp = (const u_char *) (poll_msg + 1);
 	    break;
 	}
 	case PGM_POLR: {