summaryrefslogtreecommitdiff
path: root/file.c
diff options
context:
space:
mode:
authorStephen Fisher <steve@stephen-fisher.com>2007-04-03 21:17:13 +0000
committerStephen Fisher <steve@stephen-fisher.com>2007-04-03 21:17:13 +0000
commit6625e7503ff42d40780a1bf36e8070c02624ba6b (patch)
treec6563c2f2dae079e0be033a6a8fc81221faea4bc /file.c
parent8a277a497f8dde4a143d6617b0f669e0ff62b5bf (diff)
downloadwireshark-6625e7503ff42d40780a1bf36e8070c02624ba6b.tar.gz
Fix warnings on Linux/gcc 4.1.1
svn path=/trunk/; revision=21330
Diffstat (limited to 'file.c')
-rw-r--r--file.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/file.c b/file.c
index 1e739f4e0c..1823ad8e96 100644
--- a/file.c
+++ b/file.c
@@ -1058,7 +1058,9 @@ read_packet(capture_file *cf, dfilter_t *dfcode, gint64 offset)
fdata->flags.ref_time = 0;
fdata->color_filter = NULL;
- fdata->abs_ts = *((nstime_t *) &phdr->ts);
+ fdata->abs_ts.secs = phdr->ts.secs;
+ fdata->abs_ts.nsecs = phdr->ts.nsecs;
+
if (cf->plist_end != NULL)
nstime_delta(&fdata->del_cap_ts, &fdata->abs_ts, &cf->plist_end->abs_ts);
else
@@ -3324,7 +3326,8 @@ save_packet(capture_file *cf _U_, frame_data *fdata,
int err;
/* init the wtap header for saving */
- hdr.ts = *(struct wtap_nstime *) &fdata->abs_ts;
+ hdr.ts.secs = fdata->abs_ts.secs;
+ hdr.ts.nsecs = fdata->abs_ts.nsecs;
hdr.caplen = fdata->cap_len;
hdr.len = fdata->pkt_len;
hdr.pkt_encap = fdata->lnk_t;