Replace wtap_nstime with nstime_t, remove wtap_nstime_to_sec.

After r50154 nstime_t is inside wsutil/ so wiretap don't need it's own copy. 

svn path=/trunk/; revision=53184

6 files changed, 11 insertions, 14 deletions

diff --git a/wiretap/catapult_dct2000.c b/wiretap/catapult_dct2000.c
index 756671554e..22a04f6f92 100644
--- a/wiretap/catapult_dct2000.c
+++ b/wiretap/catapult_dct2000.c
@@ -546,8 +546,8 @@ catapult_dct2000_close(wtap *wth)
 /***************************/
 
 typedef struct {
-    gboolean           first_packet_written;
-    struct wtap_nstime start_time;
+    gboolean   first_packet_written;
+    nstime_t   start_time;
 } dct2000_dump_t;
 
 /*****************************************************/
diff --git a/wiretap/merge.c b/wiretap/merge.c
index 264f66c3ed..34f71ec7c5 100644
--- a/wiretap/merge.c
+++ b/wiretap/merge.c
@@ -150,7 +150,8 @@ merge_max_snapshot_length(int count, merge_in_file_t in_files[])
  * returns TRUE if first argument is earlier than second
  */
 static gboolean
-is_earlier(struct wtap_nstime *l, struct wtap_nstime *r) {
+is_earlier(nstime_t *l, nstime_t *r) /* XXX, move to nstime.c */
+{
   if (l->secs > r->secs) {  /* left is later */
     return FALSE;
   } else if (l->secs < r->secs) { /* left is earlier */
@@ -183,7 +184,7 @@ merge_read_packet(int in_file_count, merge_in_file_t in_files[],
 {
   int i;
   int ei = -1;
-  struct wtap_nstime tv = { sizeof(time_t) > sizeof(int) ? LONG_MAX : INT_MAX, INT_MAX };
+  nstime_t tv = { sizeof(time_t) > sizeof(int) ? LONG_MAX : INT_MAX, INT_MAX };
   struct wtap_pkthdr *phdr;
 
   /*
diff --git a/wiretap/mpeg.c b/wiretap/mpeg.c
index 7a33985063..3767978747 100644
--- a/wiretap/mpeg.c
+++ b/wiretap/mpeg.c
@@ -47,7 +47,7 @@
 #define PES_VALID(n) (((n) >> 8 & 0xffffff) == PES_PREFIX)
 
 typedef struct {
-	struct wtap_nstime now;
+	nstime_t now;
 	time_t t0;
 } mpeg_t;
 
@@ -100,7 +100,7 @@ mpeg_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset)
 	guint32 n;
 	int bytes_read = mpeg_read_header(wth, err, err_info, &n);
 	unsigned int packet_size;
-	struct wtap_nstime ts = mpeg->now;
+	nstime_t ts = mpeg->now;
 
 	if (bytes_read == -1)
 		return FALSE;
diff --git a/wiretap/netmon.c b/wiretap/netmon.c
index b23ba625d0..4b41f35168 100644
--- a/wiretap/netmon.c
+++ b/wiretap/netmon.c
@@ -927,7 +927,7 @@ netmon_sequential_close(wtap *wth)
 
 typedef struct {
 	gboolean got_first_record_time;
-	struct wtap_nstime first_record_time;
+	nstime_t first_record_time;
 	guint32	frame_table_offset;
 	guint32	*frame_table;
 	guint	frame_table_index;
diff --git a/wiretap/netxray.c b/wiretap/netxray.c
index c83c7664e5..2d4481260e 100644
--- a/wiretap/netxray.c
+++ b/wiretap/netxray.c
@@ -1440,7 +1440,7 @@ netxray_set_phdr(wtap *wth, Buffer *buf, int len,
 
 typedef struct {
 	gboolean first_frame;
-	struct wtap_nstime start;
+	nstime_t start;
 	guint32	nframes;
 } netxray_dump_t;
 
diff --git a/wiretap/wtap.h b/wiretap/wtap.h
index 9ff595ca2d..e4339ca71b 100644
--- a/wiretap/wtap.h
+++ b/wiretap/wtap.h
@@ -30,6 +30,7 @@
 #include <glib.h>
 #include <time.h>
 #include <wiretap/buffer.h>
+#include <wsutil/nstime.h>
 #include "ws_symbol_export.h"
 
 #ifdef __cplusplus
@@ -865,14 +866,9 @@ union wtap_pseudo_header {
     struct llcp_phdr    llcp;
 };
 
-struct wtap_nstime {
-    time_t secs;
-    int    nsecs;
-};
-
 struct wtap_pkthdr {
     guint32             presence_flags; /* what stuff do we have? */
-    struct wtap_nstime  ts;
+    nstime_t            ts;
     guint32             caplen;         /* data length in the file */
     guint32             len;            /* data length on the wire */
     int                 pkt_encap;