diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-08-31 16:19:09 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-08-31 16:19:09 -0700 |
| commit | 91579fe605d3a11491ba24f8eecc42c15c1f82b3 (patch) | |
| tree | 49c93f4d9321da79b51616522084598a7c746b83 /print-pppoe.c | |
| parent | 12f9b2e8492a61b5db48518edcd4fab5bb03c4a3 (diff) | |
| download | tcpdump-91579fe605d3a11491ba24f8eecc42c15c1f82b3.tar.gz | |
Avoid collisions with isascii().
Those variables are counts, so just give them names that reflects that.
Diffstat (limited to 'print-pppoe.c')
| -rw-r--r-- | print-pppoe.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/print-pppoe.c b/print-pppoe.c index 8a2870a9..aeb38630 100644 --- a/print-pppoe.c +++ b/print-pppoe.c @@ -146,7 +146,7 @@ pppoe_print(netdissect_options *ndo, register const u_char *bp, u_int length) /* p points to tag_value */ if (tag_len) { - unsigned isascii = 0, isgarbage = 0; + unsigned ascii_count = 0, garbage_count = 0; const u_char *v; char tag_str[MAXTAGPRINT]; unsigned tag_str_len = 0; @@ -156,14 +156,14 @@ pppoe_print(netdissect_options *ndo, register const u_char *bp, u_int length) for (v = p; v < p + tag_len && tag_str_len < MAXTAGPRINT-1; v++) if (*v >= 32 && *v < 127) { tag_str[tag_str_len++] = *v; - isascii++; + ascii_count++; } else { tag_str[tag_str_len++] = '.'; - isgarbage++; + garbage_count++; } tag_str[tag_str_len] = 0; - if (isascii > isgarbage) { + if (ascii_count > garbage_count) { ND_PRINT((ndo, " [%s \"%*.*s\"]", tok2str(pppoetag2str, "TAG-0x%x", tag_type), (int)tag_str_len, |