diff options
Diffstat (limited to 'epan/addr_resolv.c')
| -rw-r--r-- | epan/addr_resolv.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c index 02e68187a2..9049764334 100644 --- a/epan/addr_resolv.c +++ b/epan/addr_resolv.c @@ -1284,11 +1284,8 @@ parse_ether_line(char *line, ether_t *eth, unsigned int *mask, return -1; if ((cp = strchr(line, '#'))) { - cp--; - while (g_ascii_isspace(*cp)) { - cp--; - } *cp = '\0'; + g_strchomp(line); } if ((cp = strtok(line, " \t")) == NULL) @@ -1302,7 +1299,7 @@ parse_ether_line(char *line, ether_t *eth, unsigned int *mask, g_strlcpy(eth->name, cp, MAXNAMELEN); - if ((cp = strtok(NULL, "")) != NULL) + if ((cp = strtok(NULL, "\t")) != NULL) { g_strlcpy(eth->longname, cp, MAXNAMELEN); } else { |