]> The Tcpdump Group git mirrors - tcpdump/commitdiff
Fix a warning
authorFrancois-Xavier Le Bail <[email protected]>
Thu, 19 Sep 2019 17:58:58 +0000 (19:58 +0200)
committerFrancois-Xavier Le Bail <[email protected]>
Thu, 19 Sep 2019 17:58:58 +0000 (19:58 +0200)
poll() is a system API on UN*Xes, some compilers warn like:

./print-pgm.c: In function 'pgm_print':
./print-pgm.c:256:29: warning: declaration of 'poll' shadows a global
declaration [-Wshadow]

Rename the variable 'pgm_poll'.

print-pgm.c

index a7ac64a8379d767067abba4593fb1c2279cf0a6e..6926be2348ad43ba86e124066942cb9a4a8dd199 100644 (file)
@@ -253,14 +253,14 @@ pgm_print(netdissect_options *ndo,
        }
 
        case PGM_POLL: {
-           const struct pgm_poll *poll;
+           const struct pgm_poll *pgm_poll;
            uint32_t ivl, rnd, mask;
 
-           poll = (const struct pgm_poll *)(pgm + 1);
-           ND_TCHECK_SIZE(poll);
-           bp = (const u_char *) (poll + 1);
+           pgm_poll = (const struct pgm_poll *)(pgm + 1);
+           ND_TCHECK_SIZE(pgm_poll);
+           bp = (const u_char *) (pgm_poll + 1);
 
-           switch (GET_BE_U_2(poll->pgmp_nla_afi)) {
+           switch (GET_BE_U_2(pgm_poll->pgmp_nla_afi)) {
            case AFNUM_INET:
                ND_TCHECK_LEN(bp, sizeof(nd_ipv4));
                addrtostr(bp, nla_buf, sizeof(nla_buf));
@@ -289,8 +289,8 @@ pgm_print(netdissect_options *ndo,
            bp += sizeof(uint32_t);
 
            ND_PRINT("POLL seq %u round %u nla %s ivl %u rnd 0x%08x "
-                        "mask 0x%08x", GET_BE_U_4(poll->pgmp_seq),
-                        GET_BE_U_2(poll->pgmp_round), nla_buf, ivl, rnd,
+                        "mask 0x%08x", GET_BE_U_4(pgm_poll->pgmp_seq),
+                        GET_BE_U_2(pgm_poll->pgmp_round), nla_buf, ivl, rnd,
                         mask);
            break;
        }