diff options
author | Guy Harris <guy@alum.mit.edu> | 2013-08-22 03:42:15 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2013-08-22 03:42:15 +0000 |
commit | 0c550e90905a6f24366935a519cb5ea101615302 (patch) | |
tree | 3cf4fe1e79394c2829d10e1c3040aad78585a170 /wiretap | |
parent | a4609262b0019d67045f3e15a9db1220a631dbed (diff) |
Back out the previous change, so I can check it in again with the
*correct* checkin message. Sigh....
svn path=/trunk/; revision=51466
Diffstat (limited to 'wiretap')
-rw-r--r-- | wiretap/file_access.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/wiretap/file_access.c b/wiretap/file_access.c index 356f8374f3..3fba56d0ed 100644 --- a/wiretap/file_access.c +++ b/wiretap/file_access.c @@ -140,6 +140,7 @@ static wtap_open_routine_t open_routines_base[] = { aethra_open, btsnoop_open, eyesdn_open, + vwr_open, /* XXX - this is really a heuristic */ packetlogger_open, /* This type does not have a magic number, but its * files are sometimes grabbed by mpeg_open. */ mpeg_open, @@ -157,14 +158,9 @@ static wtap_open_routine_t open_routines_base[] = { /* I put NetScreen *before* erf, because there were some * false positives with my test-files (Sake Blok, July 2007) - * - * I put VWR *after* ERF, because there were some cases where - * ERF files were misidentified as vwr files (Stephen - * Donnelly, August 2013; see bug 9054) */ netscreen_open, erf_open, - vwr_open, ipfix_open, k12text_open, peekclassic_open, |