Changeset 8c42377

Timestamp:

06/23/14 16:00:14 (6 years ago)

Author:

Richard Sanger <rsangerarj@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, 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:

5876154, e3a639a

Parents:

014f733

Message:

Fix some BSD warnings/errors

Location:

lib

Files:

• data-struct/deque.c (modified) (1 diff)
• data-struct/message_queue.h (modified) (1 diff)
• data-struct/vector.h (modified) (2 diffs)
• hash_toeplitz.c (modified) (1 diff)
• libtrace.h.in (modified) (3 diffs)
• libtrace_int.h (modified) (2 diffs)

lib/data-struct/deque.c

@@ -3 +3 @@
 #include <assert.h>
 #include <stddef.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 

lib/data-struct/message_queue.h

@@ -6 +6 @@
 
 #define LIBTRACE_MQ_FAILED INT_MIN
-typedef struct libtrace_thread_t libtrace_thread_t;
 typedef struct libtrace_message_queue_t {
         int pipefd[2];

lib/data-struct/vector.h

@@ -7 +7 @@
 
 typedef void (*vector_data_fn)(void *data);
-typedef struct libtrace_vector {
+struct libtrace_vector {
         size_t max_size;
         size_t size;
@@ -13 +13 @@
         char *elements; // Means we can use array indexing
         pthread_mutex_t lock;
-} libtrace_vector_t;
+};
 
 DLLEXPORT void libtrace_vector_init(libtrace_vector_t *v, size_t element_size);

lib/hash_toeplitz.c

@@ -7 +7 @@
  */
 #include "hash_toeplitz.h"
-#include <malloc.h>
 #include <string.h>
 #include <stdlib.h>

lib/libtrace.h.in

@@ -203 +203 @@
 } libtrace_result_t;
 
-typedef struct libtrace_message_t libtrace_message_t;
-
 typedef struct libtrace_thread_t libtrace_thread_t;
 
@@ -3112 +3110 @@
 /*@}*/
 
+union libtrace_64byte_things {
+        void *ptr;
+        int64_t sint64;
+        uint64_t uint64;
+        uint32_t uint32s[2];
+        int32_t sint32s[2];
+        uint32_t uint32;
+        int32_t sint32;
+        int sint;
+        unsigned int uint;
+        char schars[8];
+        char uchars[8];
+};
+
+typedef struct libtrace_message_t {
+        int code;
+        union libtrace_64byte_things additional;
+        libtrace_thread_t *sender;
+} libtrace_message_t;
+
 typedef void* (*fn_per_pkt)(libtrace_t* trace, libtrace_packet_t *p, libtrace_message_t *m, libtrace_thread_t *thread);
 typedef void* (*fn_reducer)(libtrace_t* trace, void* global_blob);
@@ -3157 +3175 @@
 
 DLLEXPORT int retrive_first_packet(libtrace_t *libtrace, libtrace_packet_t **packet, struct timeval **tv);
-
-union libtrace_64byte_things {
-        void *ptr;
-        int64_t sint64;
-        uint64_t uint64;
-        uint32_t uint32s[2];
-        int32_t sint32s[2];
-        uint32_t uint32;
-        int32_t sint32;
-        int sint;
-        unsigned int uint;
-        char schars[8];
-        char uchars[8];
-};
-
-typedef struct libtrace_message_t {
-        int code;
-        union libtrace_64byte_things additional;
-        libtrace_thread_t *sender;
-} libtrace_message_t;
 
 typedef enum {

lib/libtrace_int.h

@@ -203 +203 @@
  * Information of this thread
  */
-typedef struct libtrace_thread_t {
+struct libtrace_thread_t {
         libtrace_t * trace;
         void* ret;
@@ -225 +225 @@
         // For thread safety reason we actually must store this here
         int64_t tracetime_offset_usec;
-} libtrace_thread_t;
+};
 
 /**