The return value from "fwrite()" is a "size_t"; make the variable into

which we store it a "size_t", and then fix up the bugs that were
revealed by the compiler warnings that produced - "fwrite()" returns 0,
not a negative number, on an I/O error.

Fix up some other items to have type "size_t", or to have various
unsigned types, while we're at it, to squelch compiler warnings.

svn path=/trunk/; revision=3867

6 files changed, 47 insertions, 47 deletions

diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c
index 294bb95d66..f1164cfa3f 100644
--- a/wiretap/libpcap.c
+++ b/wiretap/libpcap.c
@@ -1,6 +1,6 @@
 /* libpcap.c
  *
- * $Id: libpcap.c,v 1.49 2001/07/13 00:55:58 guy Exp $
+ * $Id: libpcap.c,v 1.50 2001/08/25 03:18:48 guy Exp $
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org>
@@ -916,7 +916,7 @@ gboolean libpcap_dump_open(wtap_dumper *wdh, int *err)
 {
 	guint32 magic;
 	struct pcap_hdr file_hdr;
-	int nwritten;
+	size_t nwritten;
 
 	/* This is a libpcap file */
 	wdh->subtype_write = libpcap_dump;
@@ -945,7 +945,7 @@ gboolean libpcap_dump_open(wtap_dumper *wdh, int *err)
 
 	nwritten = fwrite(&magic, 1, sizeof magic, wdh->fh);
 	if (nwritten != sizeof magic) {
-		if (nwritten < 0)
+		if (nwritten == 0 && ferror(wdh->fh))
 			*err = errno;
 		else
 			*err = WTAP_ERR_SHORT_WRITE;
@@ -961,7 +961,7 @@ gboolean libpcap_dump_open(wtap_dumper *wdh, int *err)
 	file_hdr.network = wtap_wtap_encap_to_pcap_encap(wdh->encap);
 	nwritten = fwrite(&file_hdr, 1, sizeof file_hdr, wdh->fh);
 	if (nwritten != sizeof file_hdr) {
-		if (nwritten < 0)
+		if (nwritten == 0 && ferror(wdh->fh))
 			*err = errno;
 		else
 			*err = WTAP_ERR_SHORT_WRITE;
@@ -977,8 +977,8 @@ static gboolean libpcap_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
     const union wtap_pseudo_header *pseudo_header, const u_char *pd, int *err)
 {
 	struct pcaprec_ss990915_hdr rec_hdr;
-	int hdr_size;
-	int nwritten;
+	size_t hdr_size;
+	size_t nwritten;
 
 	rec_hdr.hdr.ts_sec = phdr->ts.tv_sec;
 	rec_hdr.hdr.ts_usec = phdr->ts.tv_usec;
@@ -1045,7 +1045,7 @@ static gboolean libpcap_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
 
 	nwritten = fwrite(&rec_hdr, 1, hdr_size, wdh->fh);
 	if (nwritten != hdr_size) {
-		if (nwritten < 0)
+		if (nwritten == 0 && ferror(wdh->fh))
 			*err = errno;
 		else
 			*err = WTAP_ERR_SHORT_WRITE;
@@ -1053,7 +1053,7 @@ static gboolean libpcap_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
 	}
 	nwritten = fwrite(pd, 1, phdr->caplen, wdh->fh);
 	if (nwritten != phdr->caplen) {
-		if (nwritten < 0)
+		if (nwritten == 0 && ferror(wdh->fh))
 			*err = errno;
 		else
 			*err = WTAP_ERR_SHORT_WRITE;
diff --git a/wiretap/netmon.c b/wiretap/netmon.c
index d90f601155..76cf224640 100644
--- a/wiretap/netmon.c
+++ b/wiretap/netmon.c
@@ -1,6 +1,6 @@
 /* netmon.c
  *
- * $Id: netmon.c,v 1.39 2001/07/15 19:14:03 guy Exp $
+ * $Id: netmon.c,v 1.40 2001/08/25 03:18:48 guy Exp $
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org>
@@ -123,7 +123,7 @@ int netmon_open(wtap *wth, int *err)
 	struct tm tm;
 	int frame_table_offset;
 	guint32 frame_table_length;
-	int frame_table_size;
+	guint32 frame_table_size;
 	guint32 *frame_table;
 #ifdef WORDS_BIGENDIAN
 	unsigned int i;
@@ -474,8 +474,8 @@ static gboolean netmon_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
 	struct netmonrec_1_x_hdr rec_1_x_hdr;
 	struct netmonrec_2_x_hdr rec_2_x_hdr;
 	char *hdrp;
-	int hdr_size;
-	int nwritten;
+	size_t hdr_size;
+	size_t nwritten;
 	double t;
 	guint32 time_low, time_high;
 
@@ -528,7 +528,7 @@ static gboolean netmon_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
 
 	nwritten = fwrite(hdrp, 1, hdr_size, wdh->fh);
 	if (nwritten != hdr_size) {
-		if (nwritten < 0)
+		if (nwritten == 0 && ferror(wdh->fh))
 			*err = errno;
 		else
 			*err = WTAP_ERR_SHORT_WRITE;
@@ -536,7 +536,7 @@ static gboolean netmon_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
 	}
 	nwritten = fwrite(pd, 1, phdr->caplen, wdh->fh);
 	if (nwritten != phdr->caplen) {
-		if (nwritten < 0)
+		if (nwritten == 0 && ferror(wdh->fh))
 			*err = errno;
 		else
 			*err = WTAP_ERR_SHORT_WRITE;
@@ -578,11 +578,11 @@ static gboolean netmon_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
 static gboolean netmon_dump_close(wtap_dumper *wdh, int *err)
 {
 	netmon_dump_t *netmon = wdh->dump.netmon;
-	int n_to_write;
-	int nwritten;
+	size_t n_to_write;
+	size_t nwritten;
 	struct netmon_hdr file_hdr;
 	const char *magicp;
-	int magic_size;
+	size_t magic_size;
 	struct tm *tm;
 
 	/* Write out the frame table.  "netmon->frame_table_index" is
@@ -590,7 +590,7 @@ static gboolean netmon_dump_close(wtap_dumper *wdh, int *err)
 	n_to_write = netmon->frame_table_index * sizeof *netmon->frame_table;
 	nwritten = fwrite(netmon->frame_table, 1, n_to_write, wdh->fh);
 	if (nwritten != n_to_write) {
-		if (nwritten < 0)
+		if (nwritten == 0 && ferror(wdh->fh))
 			*err = errno;
 		else
 			*err = WTAP_ERR_SHORT_WRITE;
@@ -626,7 +626,7 @@ static gboolean netmon_dump_close(wtap_dumper *wdh, int *err)
 	}
 	nwritten = fwrite(magicp, 1, magic_size, wdh->fh);
 	if (nwritten != magic_size) {
-		if (nwritten < 0)
+		if (nwritten == 0 && ferror(wdh->fh))
 			*err = errno;
 		else
 			*err = WTAP_ERR_SHORT_WRITE;
@@ -659,7 +659,7 @@ static gboolean netmon_dump_close(wtap_dumper *wdh, int *err)
 	    htolel(netmon->frame_table_index * sizeof *netmon->frame_table);
 	nwritten = fwrite(&file_hdr, 1, sizeof file_hdr, wdh->fh);
 	if (nwritten != sizeof file_hdr) {
-		if (nwritten < 0)
+		if (nwritten == 0 && ferror(wdh->fh))
 			*err = errno;
 		else
 			*err = WTAP_ERR_SHORT_WRITE;
diff --git a/wiretap/netxray.c b/wiretap/netxray.c
index df6e1cf2f5..f6fa286364 100644
--- a/wiretap/netxray.c
+++ b/wiretap/netxray.c
@@ -1,6 +1,6 @@
 /* netxray.c
  *
- * $Id: netxray.c,v 1.39 2001/05/09 04:42:27 guy Exp $
+ * $Id: netxray.c,v 1.40 2001/08/25 03:18:48 guy Exp $
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org>
@@ -383,7 +383,7 @@ static gboolean netxray_dump_1_1(wtap_dumper *wdh, const struct wtap_pkthdr *phd
     netxray_dump_t *netxray = wdh->dump.netxray;
     guint32 timestamp;
     struct netxrayrec_1_x_hdr rec_hdr;
-    int nwritten;
+    size_t nwritten;
 
     /* NetXRay/Windows Sniffer files have a capture start date/time
        in the header, in a UNIX-style format, with one-second resolution,
@@ -411,7 +411,7 @@ static gboolean netxray_dump_1_1(wtap_dumper *wdh, const struct wtap_pkthdr *phd
 	
     nwritten = fwrite(&rec_hdr, 1, sizeof(rec_hdr), wdh->fh);
     if (nwritten != sizeof(rec_hdr)) {
-	if (nwritten < 0)
+	if (nwritten == 0 && ferror(wdh->fh))
 	    *err = errno;
 	else
 	    *err = WTAP_ERR_SHORT_WRITE;
@@ -421,7 +421,7 @@ static gboolean netxray_dump_1_1(wtap_dumper *wdh, const struct wtap_pkthdr *phd
     /* write the packet data */	
     nwritten = fwrite(pd, 1, phdr->caplen, wdh->fh);
     if (nwritten != phdr->caplen) {
-	if (nwritten < 0)
+	if (nwritten == 0 && ferror(wdh->fh))
 	    *err = errno;
 	else
 	    *err = WTAP_ERR_SHORT_WRITE;
@@ -441,7 +441,7 @@ static gboolean netxray_dump_close_1_1(wtap_dumper *wdh, int *err)
     netxray_dump_t *netxray = wdh->dump.netxray;
     guint32 filelen;
     struct netxray_hdr file_hdr;
-    int nwritten;
+    size_t nwritten;
 
     filelen = ftell(wdh->fh);
 
@@ -451,7 +451,7 @@ static gboolean netxray_dump_close_1_1(wtap_dumper *wdh, int *err)
     /* Rewrite the file header. */
     nwritten = fwrite(netxray_magic, 1, sizeof netxray_magic, wdh->fh);
     if (nwritten != sizeof netxray_magic) {
-	if (nwritten < 0)
+	if (nwritten == 0 && ferror(wdh->fh))
 	    *err = errno;
 	else
 	    *err = WTAP_ERR_SHORT_WRITE;
@@ -473,7 +473,7 @@ static gboolean netxray_dump_close_1_1(wtap_dumper *wdh, int *err)
     memcpy(hdr_buf, &file_hdr, sizeof(file_hdr));
     nwritten = fwrite(hdr_buf, 1, sizeof hdr_buf, wdh->fh);
     if (nwritten != sizeof hdr_buf) {
-	if (nwritten < 0)
+	if (nwritten == 0 && ferror(wdh->fh))
 	    *err = errno;
 	else
 	    *err = WTAP_ERR_SHORT_WRITE;
diff --git a/wiretap/ngsniffer.c b/wiretap/ngsniffer.c
index 691db45107..c010447dec 100644
--- a/wiretap/ngsniffer.c
+++ b/wiretap/ngsniffer.c
@@ -1,6 +1,6 @@
 /* ngsniffer.c
  *
- * $Id: ngsniffer.c,v 1.65 2001/07/15 19:14:03 guy Exp $
+ * $Id: ngsniffer.c,v 1.66 2001/08/25 03:18:48 guy Exp $
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org>
@@ -1149,7 +1149,7 @@ int ngsniffer_dump_can_write_encap(int filetype, int encap)
    failure */
 gboolean ngsniffer_dump_open(wtap_dumper *wdh, int *err)
 {
-    int nwritten;
+    size_t nwritten;
     char buf[6] = {REC_VERS, 0x00, 0x12, 0x00, 0x00, 0x00}; /* version record */
 
     /* This is a sniffer file */
@@ -1163,7 +1163,7 @@ gboolean ngsniffer_dump_open(wtap_dumper *wdh, int *err)
     /* Write the file header. */
     nwritten = fwrite(ngsniffer_magic, 1, sizeof ngsniffer_magic, wdh->fh);
     if (nwritten != sizeof ngsniffer_magic) {
-	if (nwritten < 0)
+	if (nwritten == 0 && ferror(wdh->fh))
 	    *err = errno;
 	else
 	    *err = WTAP_ERR_SHORT_WRITE;
@@ -1171,7 +1171,7 @@ gboolean ngsniffer_dump_open(wtap_dumper *wdh, int *err)
     }
     nwritten = fwrite(buf, 1, 6, wdh->fh);
     if (nwritten != 6) {
-	if (nwritten < 0)
+	if (nwritten == 0 && ferror(wdh->fh))
 	    *err = errno;
 	else
 	    *err = WTAP_ERR_SHORT_WRITE;
@@ -1188,7 +1188,7 @@ static gboolean ngsniffer_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
 {
     ngsniffer_dump_t *priv = wdh->dump.ngsniffer;
     struct frame2_rec rec_hdr;
-    int nwritten;
+    size_t nwritten;
     char buf[6];
     double t;
     guint16 t_low, t_med, t_high;
@@ -1232,7 +1232,7 @@ static gboolean ngsniffer_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
 	version.rsvd[1] = 0;
 	nwritten = fwrite(&version, 1, sizeof version, wdh->fh);
 	if (nwritten != sizeof version) {
-	    if (nwritten < 0)
+	    if (nwritten == 0 && ferror(wdh->fh))
 		*err = errno;
 	    else
 		*err = WTAP_ERR_SHORT_WRITE;
@@ -1248,7 +1248,7 @@ static gboolean ngsniffer_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
     buf[5] = 0x00;
     nwritten = fwrite(buf, 1, 6, wdh->fh);
     if (nwritten != 6) {
-	if (nwritten < 0)
+	if (nwritten == 0 && ferror(wdh->fh))
 	    *err = errno;
 	else
 	    *err = WTAP_ERR_SHORT_WRITE;
@@ -1272,7 +1272,7 @@ static gboolean ngsniffer_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
     rec_hdr.rsvd = 0;
     nwritten = fwrite(&rec_hdr, 1, sizeof rec_hdr, wdh->fh);
     if (nwritten != sizeof rec_hdr) {
-	if (nwritten < 0)
+	if (nwritten == 0 && ferror(wdh->fh))
 	    *err = errno;
 	else
 	    *err = WTAP_ERR_SHORT_WRITE;
@@ -1280,7 +1280,7 @@ static gboolean ngsniffer_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
     }
     nwritten = fwrite(pd, 1, phdr->caplen, wdh->fh);
     if (nwritten != phdr->caplen) {
-	if (nwritten < 0)
+	if (nwritten == 0 && ferror(wdh->fh))
 	    *err = errno;
 	else
 	    *err = WTAP_ERR_SHORT_WRITE;
@@ -1295,11 +1295,11 @@ static gboolean ngsniffer_dump_close(wtap_dumper *wdh, int *err)
 {
     /* EOF record */
     char buf[6] = {REC_EOF, 0x00, 0x00, 0x00, 0x00, 0x00};
-    int nwritten;
+    size_t nwritten;
 
     nwritten = fwrite(buf, 1, 6, wdh->fh);
     if (nwritten != 6) {
-	if (nwritten < 0)
+	if (nwritten == 0 && ferror(wdh->fh))
 	    *err = errno;
 	else
 	    *err = WTAP_ERR_SHORT_WRITE;
diff --git a/wiretap/snoop.c b/wiretap/snoop.c
index b46273d347..fd7d2f338d 100644
--- a/wiretap/snoop.c
+++ b/wiretap/snoop.c
@@ -1,6 +1,6 @@
 /* snoop.c
  *
- * $Id: snoop.c,v 1.35 2001/08/25 02:56:31 guy Exp $
+ * $Id: snoop.c,v 1.36 2001/08/25 03:18:48 guy Exp $
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org>
@@ -521,7 +521,7 @@ int snoop_dump_can_write_encap(int filetype, int encap)
 gboolean snoop_dump_open(wtap_dumper *wdh, int *err)
 {
 	struct snoop_hdr file_hdr;
-	int nwritten;
+	size_t nwritten;
 
 	/* This is a snoop file */
 	wdh->subtype_write = snoop_dump;
@@ -530,7 +530,7 @@ gboolean snoop_dump_open(wtap_dumper *wdh, int *err)
 	/* Write the file header. */
 	nwritten = fwrite(&snoop_magic, 1, sizeof snoop_magic, wdh->fh);
 	if (nwritten != sizeof snoop_magic) {
-		if (nwritten < 0)
+		if (nwritten == 0 && ferror(wdh->fh))
 			*err = errno;
 		else
 			*err = WTAP_ERR_SHORT_WRITE;
@@ -542,7 +542,7 @@ gboolean snoop_dump_open(wtap_dumper *wdh, int *err)
 	file_hdr.network = htonl(wtap_encap[wdh->encap]);
 	nwritten = fwrite(&file_hdr, 1, sizeof file_hdr, wdh->fh);
 	if (nwritten != sizeof file_hdr) {
-		if (nwritten < 0)
+		if (nwritten == 0 && ferror(wdh->fh))
 			*err = errno;
 		else
 			*err = WTAP_ERR_SHORT_WRITE;
diff --git a/wiretap/wtap-int.h b/wiretap/wtap-int.h
index 7f97d97685..f6b64d0346 100644
--- a/wiretap/wtap-int.h
+++ b/wiretap/wtap-int.h
@@ -1,6 +1,6 @@
 /* wtap-int.h
  *
- * $Id: wtap-int.h,v 1.12 2001/02/13 07:07:17 guy Exp $
+ * $Id: wtap-int.h,v 1.13 2001/08/25 03:18:48 guy Exp $
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org>
@@ -93,8 +93,8 @@ typedef struct {
 	guint32	start_usecs;
 	guint8	version_major;
 	guint32 *frame_table;
-	int	frame_table_size;
-	int	current_frame;
+	guint32	frame_table_size;
+	guint	current_frame;
 } netmon_t;
 
 typedef struct {
@@ -177,8 +177,8 @@ typedef struct {
 	struct timeval first_record_time;
 	guint32	frame_table_offset;
 	guint32	*frame_table;
-	int	frame_table_index;
-	int	frame_table_size;
+	guint	frame_table_index;
+	guint	frame_table_size;
 } netmon_dump_t;
 
 struct wtap_dumper {