aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/netmon.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2000-11-19 03:47:36 +0000
committerGuy Harris <guy@alum.mit.edu>2000-11-19 03:47:36 +0000
commit4933cc340fe6e4d53eb8f1cd447080616bc72f83 (patch)
treea05660c64ec8ec13efb3259cb9df89693d13ddf0 /wiretap/netmon.c
parentea9409cb041dd2119b328e7848e4946afc654816 (diff)
"wtap_read()" must *always* set "*err" when it returns FALSE - if it's
just an EOF, it should set "*err" to 0. Fix up a bunch of read routines for various capture file types to set "*err" appropriately. svn path=/trunk/; revision=2667
Diffstat (limited to 'wiretap/netmon.c')
-rw-r--r--wiretap/netmon.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/wiretap/netmon.c b/wiretap/netmon.c
index 7a56d7b3a4..00a03cc0e9 100644
--- a/wiretap/netmon.c
+++ b/wiretap/netmon.c
@@ -1,6 +1,6 @@
/* netmon.c
*
- * $Id: netmon.c,v 1.34 2000/09/21 04:41:32 gram Exp $
+ * $Id: netmon.c,v 1.35 2000/11/19 03:47:35 guy Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org>
@@ -298,7 +298,8 @@ static gboolean netmon_read(wtap *wth, int *err, int *data_offset)
free it. */
g_free(wth->capture.netmon->frame_table);
wth->capture.netmon->frame_table = NULL;
- return 0;
+ *err = 0; /* it's just an EOF, not an error */
+ return FALSE;
}
/* Seek to the beginning of the current record, if we're