--- Git-latest\src\contrib\ports\win32\pcapif.c Sat Sep 24 04:52:23 2011 +++ src\contrib\ports\win32\pcapif.c Fri Oct 21 00:45:46 2011 @@ -136,6 +136,7 @@ /* Forward declarations. */ static void pcapif_input(u_char *user, const struct pcap_pkthdr *pkt_header, const u_char *packet); +static char *strrtrim (char *s); #ifdef PACKET_LIB_GET_ADAPTER_NETADDRESS /** Get the index of an adapter by its network address @@ -281,6 +282,7 @@ used_adapter = d; /* format vendor description */ if (desc != NULL) { + desc = strrtrim(desc); len = strlen(desc); if (strstr(desc, " ' on local host") != NULL) { len -= 16; @@ -307,7 +309,7 @@ char *desc = d->description; char descBuf[128]; size_t len; - const char* devname = d->name;; + const char* devname = d->name; if (d->name == NULL) { devname = ""; } else { @@ -319,6 +321,7 @@ printf("%2i: %s\n", i, devname); if (desc != NULL) { /* format vendor description */ + desc = strrtrim(desc); len = strlen(desc); if (strstr(desc, " ' on local host") != NULL) { len -= 16; @@ -773,4 +776,17 @@ } #endif /* !PCAPIF_RX_USE_THREAD */ +/* Trim trailing blanks (space/tab) from a string. + */ +static char *strrtrim (char *s) +{ + size_t n = strlen (s); + while (n) + { + if (!isspace((int)s[--n])) + break; + s[n] = '\0'; + } + return (s); +} #endif /* LWIP_ETHERNET */