Changeset c69b593

Timestamp:

07/27/10 17:04:51 (11 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

d08c691

Parents:

9d5062a

Message:

• More strict aliasing fixes

File:

• lib/format_linux.c (modified) (2 diffs)

lib/format_linux.c

@@ -513 +513 @@
                         && cmsg->cmsg_type == SO_TIMESTAMP
                         && cmsg->cmsg_len <= CMSG_LEN(sizeof(struct timeval))) {
-                        hdr->tv.tv_sec = ((struct timeval*)CMSG_DATA(cmsg))->tv_sec;
-                        hdr->tv.tv_usec = ((struct timeval*)CMSG_DATA(cmsg))->tv_usec;
+                        
+                        struct timeval *tv;
+                        tv = (struct timeval *)CMSG_DATA(cmsg);
+                        
+                        
+                        hdr->tv.tv_sec = tv->tv_sec;
+                        hdr->tv.tv_usec = tv->tv_usec;
                         hdr->timestamptype = TS_TIMEVAL;
                         break;
@@ -522 +527 @@
                         && cmsg->cmsg_type == SO_TIMESTAMPNS
                         && cmsg->cmsg_len <= CMSG_LEN(sizeof(struct timespec))) {
-                        hdr->ts.tv_sec = ((struct timespec*)CMSG_DATA(cmsg))->tv_sec;
-                        hdr->ts.tv_nsec = ((struct timespec*)CMSG_DATA(cmsg))->tv_nsec;
+
+                        struct timespec *tv;
+                        tv = (struct timespec *)CMSG_DATA(cmsg);
+
+                        hdr->ts.tv_sec = tv->tv_sec;
+                        hdr->ts.tv_nsec = tv->tv_nsec;
                         hdr->timestamptype = TS_TIMESPEC;
                         break;