More structure assignments for nstime_t.

Change-Id: I4d320b50d7d74b6fc423014c9611a60d49c6be02
Reviewed-on: https://code.wireshark.org/review/13503
Reviewed-by: Guy Harris <guy@alum.mit.edu>

diff --git a/editcap.c b/editcap.c
index fcda8b08acb14f9b6e9cffb7b8ed9dae16f81bf2..47d954265f4616540864135b0c243b6405ee10f1 100644 (file)
--- a/editcap.c
+++ b/editcap.c
@@ -1395,8 +1395,7 @@ main(int argc, char *argv[])
              */
             if (phdr->presence_flags & WTAP_HAS_TS) {
                 if (nstime_is_unset(&block_start)) {
-                    block_start.secs = phdr->ts.secs;
-                    block_start.nsecs = phdr->ts.nsecs;
+                    block_start = phdr->ts;
                 }
 
                 if (secs_per_block > 0) {
@@ -1516,8 +1515,7 @@ main(int argc, char *argv[])
                                 nstime_t current;
                                 nstime_t delta;
 
-                                current.secs = phdr->ts.secs;
-                                current.nsecs = phdr->ts.nsecs;
+                                current = phdr->ts;
 
                                 nstime_delta(&delta, &current, &previous_time);
 
@@ -1561,8 +1559,7 @@ main(int argc, char *argv[])
                                 phdr = &temp_phdr;
                             }
                         }
-                        previous_time.secs = phdr->ts.secs;
-                        previous_time.nsecs = phdr->ts.nsecs;
+                        previous_time = phdr->ts;
                     }
 
                     /* assume that if the frame's tv_sec is 0, then

diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c
index 4ccef0616577afb28fd6c89a10ba1e49960d57fc..2050c30640046abdf176080738d75bbb3681c55f 100644 (file)
--- a/epan/dissectors/packet-radius.c
+++ b/epan/dissectors/packet-radius.c
@@ -2024,8 +2024,7 @@ dissect_radius(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _
 
        if (radius_call)
        {
-               rad_info->req_time.secs = radius_call->req_time.secs;
-               rad_info->req_time.nsecs = radius_call->req_time.nsecs;
+               rad_info->req_time = radius_call->req_time;
        }
 
        if (avplength > 0)

diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c
index 22d4ca60e60e07f574abfa4c075d1eee74c22d35..ae4af08712c99afb1402eb720c9dcbef2113cab1 100644 (file)
--- a/epan/dissectors/packet-tcp.c
+++ b/epan/dissectors/packet-tcp.c
@@ -5315,8 +5315,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
                                   "Connection establish request (SYN): server port %u", tcph->th_dport);
            /* Save the server port to help determine dissector used */
            tcpd->server_port = tcph->th_dport;
-           tcpd->ts_mru_syn.secs = pinfo->abs_ts.secs;
-           tcpd->ts_mru_syn.nsecs = pinfo->abs_ts.nsecs;
+           tcpd->ts_mru_syn = pinfo->abs_ts;
         }
     }
     if(tcph->th_flags & TH_FIN) {