Changeset bb47c98

Timestamp:

07/29/10 14:48:33 (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:

7b29593

Parents:

db32a56

Message:

• Fixed yet another strict aliasing warning

File:

• lib/ior-peek.c (modified) (3 diffs)

lib/ior-peek.c

@@ -105 +105 @@
         if (DATA(io)->length < bytes_read) {
                 int res = 0;
-
-                if (DATA(io)->buffer)
-                        free(DATA(io)->buffer);
+                void *buf_ptr = (void *)(DATA(io)->buffer);
+
+                if (buf_ptr)
+                        free(buf_ptr);
                 DATA(io)->length = bytes_read;
                 DATA(io)->offset = 0;
@@ -117 +118 @@
                  * live with.
                  */
-                res = posix_memalign((void **)&DATA(io)->buffer, 4096, 
-                                DATA(io)->length);
+                res = posix_memalign(&buf_ptr, 4096, DATA(io)->length);
                 if (res != 0) {
                         fprintf(stderr, "Error aligning IO buffer: %d\n",
@@ -124 +124 @@
                         return res;
                 }
+                DATA(io)->buffer = buf_ptr;
 #else
                 DATA(io)->buffer = malloc(DATA(io)->length);