Rename the "private" member of a "wtap_dumper" structure to "dump", as

per the "capture" member of a "wtap" structure, so that it doesn't
collide with the C++ reserved word "private".

svn path=/trunk/; revision=1936

5 files changed, 58 insertions, 58 deletions

diff --git a/wiretap/file.c b/wiretap/file.c
index 5ac32e4576..0d246e3555 100644
--- a/wiretap/file.c
+++ b/wiretap/file.c
@@ -1,6 +1,6 @@
 /* file.c
  *
- * $Id: file.c,v 1.49 2000/03/22 07:06:58 guy Exp $
+ * $Id: file.c,v 1.50 2000/05/10 22:16:28 guy Exp $
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org>
@@ -401,7 +401,7 @@ static wtap_dumper* wtap_dump_open_common(FILE *fh, int filetype, int encap,
 	wdh->file_type = filetype;
 	wdh->snaplen = snaplen;
 	wdh->encap = encap;
-	wdh->private.opaque = NULL;
+	wdh->dump.opaque = NULL;
 	wdh->subtype_write = NULL;
 	wdh->subtype_close = NULL;
 
@@ -449,8 +449,8 @@ gboolean wtap_dump_close(wtap_dumper *wdh, int *err)
 		}
 		ret = FALSE;
 	}
-	if (wdh->private.opaque != NULL)
-		g_free(wdh->private.opaque);
+	if (wdh->dump.opaque != NULL)
+		g_free(wdh->dump.opaque);
 	g_free(wdh);
 	return ret;
 }
diff --git a/wiretap/netmon.c b/wiretap/netmon.c
index 7a3bbeb5d8..0189a32cf6 100644
--- a/wiretap/netmon.c
+++ b/wiretap/netmon.c
@@ -1,6 +1,6 @@
 /* netmon.c
  *
- * $Id: netmon.c,v 1.28 2000/03/22 23:47:28 guy Exp $
+ * $Id: netmon.c,v 1.29 2000/05/10 22:16:29 guy Exp $
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org>
@@ -458,12 +458,12 @@ gboolean netmon_dump_open(wtap_dumper *wdh, int *err)
 	   skip over the header for now. */
 	fseek(wdh->fh, CAPTUREFILE_HEADER_SIZE, SEEK_SET);
 
-	wdh->private.netmon = g_malloc(sizeof(netmon_dump_t));
-	wdh->private.netmon->frame_table_offset = CAPTUREFILE_HEADER_SIZE;
-	wdh->private.netmon->got_first_record_time = FALSE;
-	wdh->private.netmon->frame_table = NULL;
-	wdh->private.netmon->frame_table_index = 0;
-	wdh->private.netmon->frame_table_size = 0;
+	wdh->dump.netmon = g_malloc(sizeof(netmon_dump_t));
+	wdh->dump.netmon->frame_table_offset = CAPTUREFILE_HEADER_SIZE;
+	wdh->dump.netmon->got_first_record_time = FALSE;
+	wdh->dump.netmon->frame_table = NULL;
+	wdh->dump.netmon->frame_table_index = 0;
+	wdh->dump.netmon->frame_table_size = 0;
 
 	return TRUE;
 }
@@ -473,7 +473,7 @@ gboolean netmon_dump_open(wtap_dumper *wdh, int *err)
 static gboolean netmon_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
     const u_char *pd, int *err)
 {
-	netmon_dump_t *priv = wdh->private.netmon;
+	netmon_dump_t *netmon = wdh->dump.netmon;
 	struct netmonrec_1_x_hdr rec_1_x_hdr;
 	struct netmonrec_2_x_hdr rec_2_x_hdr;
 	char *hdrp;
@@ -484,17 +484,17 @@ static gboolean netmon_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
 	   and have times relative to that in the packet headers;
 	   pick the time of the first packet as the capture start
 	   time. */
-	if (!priv->got_first_record_time) {
-		priv->first_record_time = phdr->ts;
-		priv->got_first_record_time = TRUE;
+	if (!netmon->got_first_record_time) {
+		netmon->first_record_time = phdr->ts;
+		netmon->got_first_record_time = TRUE;
 	}
 	
 	switch (wdh->file_type) {
 
 	case WTAP_FILE_NETMON_1_x:
 		rec_1_x_hdr.ts_delta = htolel(
-		    (phdr->ts.tv_sec - priv->first_record_time.tv_sec)*1000
-		  + (phdr->ts.tv_usec - priv->first_record_time.tv_usec + 500)/1000);
+		    (phdr->ts.tv_sec - netmon->first_record_time.tv_sec)*1000
+		  + (phdr->ts.tv_usec - netmon->first_record_time.tv_usec + 500)/1000);
 		rec_1_x_hdr.orig_len = htoles(phdr->len);
 		rec_1_x_hdr.incl_len = htoles(phdr->caplen);
 		hdrp = (char *)&rec_1_x_hdr;
@@ -536,29 +536,29 @@ static gboolean netmon_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
 	/*
 	 * Stash the file offset of this frame.
 	 */
-	if (priv->frame_table_size == 0) {
+	if (netmon->frame_table_size == 0) {
 		/*
 		 * Haven't yet allocated the buffer for the frame table.
 		 */
-		priv->frame_table = g_malloc(1024 * sizeof *priv->frame_table);
-		priv->frame_table_size = 1024;
+		netmon->frame_table = g_malloc(1024 * sizeof *netmon->frame_table);
+		netmon->frame_table_size = 1024;
 	} else {
 		/*
 		 * We've allocated it; are we at the end?
 		 */
-		if (priv->frame_table_index >= priv->frame_table_size) {
+		if (netmon->frame_table_index >= netmon->frame_table_size) {
 			/*
 			 * Yes - double the size of the frame table.
 			 */
-			priv->frame_table_size *= 2;
-			priv->frame_table = g_realloc(priv->frame_table,
-			    priv->frame_table_size * sizeof *priv->frame_table);
+			netmon->frame_table_size *= 2;
+			netmon->frame_table = g_realloc(netmon->frame_table,
+			    netmon->frame_table_size * sizeof *netmon->frame_table);
 		}
 	}
-	priv->frame_table[priv->frame_table_index] =
-	    htolel(priv->frame_table_offset);
-	priv->frame_table_index++;
-	priv->frame_table_offset += hdr_size + phdr->caplen;
+	netmon->frame_table[netmon->frame_table_index] =
+	    htolel(netmon->frame_table_offset);
+	netmon->frame_table_index++;
+	netmon->frame_table_offset += hdr_size + phdr->caplen;
 
 	return TRUE;
 }
@@ -567,7 +567,7 @@ static gboolean netmon_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
    Returns TRUE on success, FALSE on failure. */
 static gboolean netmon_dump_close(wtap_dumper *wdh, int *err)
 {
-	netmon_dump_t *priv = wdh->private.netmon;
+	netmon_dump_t *netmon = wdh->dump.netmon;
 	int n_to_write;
 	int nwritten;
 	struct netmon_hdr file_hdr;
@@ -575,10 +575,10 @@ static gboolean netmon_dump_close(wtap_dumper *wdh, int *err)
 	int magic_size;
 	struct tm *tm;
 
-	/* Write out the frame table.  "priv->frame_table_index" is
+	/* Write out the frame table.  "netmon->frame_table_index" is
 	   the number of entries we've put into it. */
-	n_to_write = priv->frame_table_index * sizeof *priv->frame_table;
-	nwritten = fwrite(priv->frame_table, 1, n_to_write, wdh->fh);
+	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)
 			*err = errno;
@@ -622,7 +622,7 @@ static gboolean netmon_dump_close(wtap_dumper *wdh, int *err)
 	}
 
 	file_hdr.network = htoles(wtap_encap[wdh->encap]);
-	tm = localtime(&priv->first_record_time.tv_sec);
+	tm = localtime(&netmon->first_record_time.tv_sec);
 	file_hdr.ts_year = htoles(1900 + tm->tm_year);
 	file_hdr.ts_month = htoles(tm->tm_mon + 1);
 	file_hdr.ts_dow = htoles(tm->tm_wday);
@@ -630,11 +630,11 @@ static gboolean netmon_dump_close(wtap_dumper *wdh, int *err)
 	file_hdr.ts_hour = htoles(tm->tm_hour);
 	file_hdr.ts_min = htoles(tm->tm_min);
 	file_hdr.ts_sec = htoles(tm->tm_sec);
-	file_hdr.ts_msec = htoles(priv->first_record_time.tv_usec/1000);
+	file_hdr.ts_msec = htoles(netmon->first_record_time.tv_usec/1000);
 		/* XXX - what about rounding? */
-	file_hdr.frametableoffset = htolel(priv->frame_table_offset);
+	file_hdr.frametableoffset = htolel(netmon->frame_table_offset);
 	file_hdr.frametablelength =
-	    htolel(priv->frame_table_index * sizeof *priv->frame_table);
+	    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)
diff --git a/wiretap/netxray.c b/wiretap/netxray.c
index b7b01fa706..54aa410410 100644
--- a/wiretap/netxray.c
+++ b/wiretap/netxray.c
@@ -1,6 +1,6 @@
 /* netxray.c
  *
- * $Id: netxray.c,v 1.25 2000/03/22 07:06:55 guy Exp $
+ * $Id: netxray.c,v 1.26 2000/05/10 22:16:29 guy Exp $
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org>
@@ -349,11 +349,11 @@ gboolean netxray_dump_open_1_1(wtap_dumper *wdh, int *err)
        skip over the header for now. */
     fseek(wdh->fh, CAPTUREFILE_HEADER_SIZE, SEEK_SET);
 
-    wdh->private.netxray = g_malloc(sizeof(netxray_dump_t));
-    wdh->private.netxray->first_frame = TRUE;
-    wdh->private.netxray->start.tv_sec = 0;
-    wdh->private.netxray->start.tv_usec = 0;
-    wdh->private.netxray->nframes = 0;
+    wdh->dump.netxray = g_malloc(sizeof(netxray_dump_t));
+    wdh->dump.netxray->first_frame = TRUE;
+    wdh->dump.netxray->start.tv_sec = 0;
+    wdh->dump.netxray->start.tv_usec = 0;
+    wdh->dump.netxray->nframes = 0;
 
     return TRUE;
 }
@@ -363,7 +363,7 @@ gboolean netxray_dump_open_1_1(wtap_dumper *wdh, int *err)
 static gboolean netxray_dump_1_1(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
     const u_char *pd, int *err)
 {
-    netxray_dump_t *priv = wdh->private.netxray;
+    netxray_dump_t *netxray = wdh->dump.netxray;
     guint32 timestamp;
     struct netxrayrec_1_x_hdr rec_hdr;
     int nwritten;
@@ -378,14 +378,14 @@ static gboolean netxray_dump_1_1(wtap_dumper *wdh, const struct wtap_pkthdr *phd
        the high-resolution start time stamp 0, with the time stamp of
        packets being the delta between the stamp of the packet and
        the stamp of the first packet with the microseconds part 0. */
-    if (priv->first_frame) {
-	priv->first_frame = FALSE;
-	priv->start = phdr->ts;
+    if (netxray->first_frame) {
+	netxray->first_frame = FALSE;
+	netxray->start = phdr->ts;
     }
 
     /* build the header for each packet */
     memset(&rec_hdr, '\0', sizeof(rec_hdr));
-    timestamp = (phdr->ts.tv_sec - priv->start.tv_sec)*1000000 +
+    timestamp = (phdr->ts.tv_sec - netxray->start.tv_sec)*1000000 +
         phdr->ts.tv_usec;
     rec_hdr.timelo = htolel(timestamp);
     rec_hdr.timehi = htolel(0);
@@ -411,7 +411,7 @@ static gboolean netxray_dump_1_1(wtap_dumper *wdh, const struct wtap_pkthdr *phd
 	return FALSE;
     }
 	
-    priv->nframes++;
+    netxray->nframes++;
 
     return TRUE;
 }
@@ -421,7 +421,7 @@ static gboolean netxray_dump_1_1(wtap_dumper *wdh, const struct wtap_pkthdr *phd
 static gboolean netxray_dump_close_1_1(wtap_dumper *wdh, int *err)
 {
     char hdr_buf[CAPTUREFILE_HEADER_SIZE - sizeof(netxray_magic)];
-    netxray_dump_t *priv = wdh->private.netxray;
+    netxray_dump_t *netxray = wdh->dump.netxray;
     guint32 filelen;
     struct netxray_hdr file_hdr;
     int nwritten;
@@ -444,8 +444,8 @@ static gboolean netxray_dump_close_1_1(wtap_dumper *wdh, int *err)
     /* "sniffer" version ? */
     memset(&file_hdr, '\0', sizeof file_hdr);
     memcpy(file_hdr.version, vers_1_1, sizeof vers_1_1);
-    file_hdr.start_time = htolel(priv->start.tv_sec);
-    file_hdr.nframes = htolel(priv->nframes);
+    file_hdr.start_time = htolel(netxray->start.tv_sec);
+    file_hdr.nframes = htolel(netxray->nframes);
     file_hdr.start_offset = htolel(CAPTUREFILE_HEADER_SIZE);
     file_hdr.end_offset = htolel(filelen);
     file_hdr.network = htoles(wtap_encap[wdh->encap]);
diff --git a/wiretap/ngsniffer.c b/wiretap/ngsniffer.c
index 632be76b10..f73db6584b 100644
--- a/wiretap/ngsniffer.c
+++ b/wiretap/ngsniffer.c
@@ -1,6 +1,6 @@
 /* ngsniffer.c
  *
- * $Id: ngsniffer.c,v 1.37 2000/03/22 07:06:57 guy Exp $
+ * $Id: ngsniffer.c,v 1.38 2000/05/10 22:16:30 guy Exp $
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org>
@@ -689,9 +689,9 @@ gboolean ngsniffer_dump_open(wtap_dumper *wdh, int *err)
     wdh->subtype_write = ngsniffer_dump;
     wdh->subtype_close = ngsniffer_dump_close;
 
-    wdh->private.ngsniffer = g_malloc(sizeof(ngsniffer_dump_t));
-    wdh->private.ngsniffer->first_frame = TRUE;
-    wdh->private.ngsniffer->start = 0;
+    wdh->dump.ngsniffer = g_malloc(sizeof(ngsniffer_dump_t));
+    wdh->dump.ngsniffer->first_frame = TRUE;
+    wdh->dump.ngsniffer->start = 0;
 
     /* Write the file header. */
     nwritten = fwrite(ngsniffer_magic, 1, sizeof ngsniffer_magic, wdh->fh);
@@ -719,7 +719,7 @@ gboolean ngsniffer_dump_open(wtap_dumper *wdh, int *err)
 static gboolean ngsniffer_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
     const u_char *pd, int *err)
 {
-    ngsniffer_dump_t *priv = wdh->private.ngsniffer;
+    ngsniffer_dump_t *priv = wdh->dump.ngsniffer;
     struct frame2_rec rec_hdr;
     int nwritten;
     char buf[6];
diff --git a/wiretap/wtap.h b/wiretap/wtap.h
index 33b05011e0..c1e8561b9a 100644
--- a/wiretap/wtap.h
+++ b/wiretap/wtap.h
@@ -1,6 +1,6 @@
 /* wtap.h
  *
- * $Id: wtap.h,v 1.67 2000/04/15 21:12:36 guy Exp $
+ * $Id: wtap.h,v 1.68 2000/05/10 22:16:31 guy Exp $
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org>
@@ -380,7 +380,7 @@ typedef struct wtap_dumper {
 		ngsniffer_dump_t	*ngsniffer;
 		netmon_dump_t		*netmon;
 		netxray_dump_t		*netxray;
-	} private;
+	} dump;
 
 	subtype_write_func	subtype_write;
 	subtype_close_func	subtype_close;