aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2007-12-16 13:01:13 +0000
committerStig Bjørlykke <stig@bjorlykke.org>2007-12-16 13:01:13 +0000
commit672659c0c24fe763674be9da1e74384b886c9057 (patch)
treeada99ad3bced9e5c2d33f14c02d2828bce133a1c
parentd8519d3c17c43d71c32e528ab0d0938fa8d9b0b4 (diff)
From Marton Nemeth:
Error message when capturing too short WTAP_ENCAP_USB_LINUX type packets contains a copy-paste typo. From me: Fix some addresses in AUTHORS. svn path=/trunk/; revision=23882
-rw-r--r--AUTHORS9
-rw-r--r--wiretap/libpcap.c2
2 files changed, 6 insertions, 5 deletions
diff --git a/AUTHORS b/AUTHORS
index 5fcd78d887..d181440f45 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,4 @@
-
+
Original Author
-------- ------
@@ -2823,10 +2823,11 @@ Ian Brumby <ian.brumby [AT] baesystems.com>
Todd J Martin <todd.martin [AT] acm.org>
Scott Robinson <scott.robinson [AT] flukenetworks.com>
Martin Peylo <wireshark [AT] izac.de>
-Stéphane Loeuillet <leroutier@gmail.com>
-Andrei Rubaniuk <rubaniuk@mail.ru>
-Mikael Magnusson <mikma264@gmail.com>
+Stéphane Loeuillet <leroutier [AT] gmail.com>
+Andrei Rubaniuk <rubaniuk [AT] mail.ru>
+Mikael Magnusson <mikma264 [AT] gmail.com>
Timo Teras <timo.teras [AT] iki.fi>
+Márton Németh <nm127 [AT] freemail.hu>
Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to
give his permission to use his version of snprintf.c.
diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c
index 04cedf9029..e8bd95ade1 100644
--- a/wiretap/libpcap.c
+++ b/wiretap/libpcap.c
@@ -1378,7 +1378,7 @@ static gboolean libpcap_read(wtap *wth, int *err, gchar **err_info,
* have a pseudo-header.
*/
*err = WTAP_ERR_BAD_RECORD;
- *err_info = g_strdup_printf("libpcap: Linux USB file has a %u-byte packet, too small to have even a LAPD pseudo-header\n",
+ *err_info = g_strdup_printf("libpcap: Linux USB file has a %u-byte packet, too small to have even a Linux USB pseudo-header\n",
packet_size);
return FALSE;
}