Changeset 5fb2251 for lib

Timestamp:

02/28/06 10:37:24 (16 years ago)

Author:

Perry Lorier <perry@…>

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:

c26ca86

Parents:

d8f02df

Message:

Cleanups
Changed fifo to use a more portable MIN() to get rid of some more warnings

Location:

lib

Files:

• fifo.c (modified) (3 diffs)
• format_erf.c (modified) (1 diff)
• rt_protocol.h (modified) (1 diff)

lib/fifo.c

@@ -64 +64 @@
 };
 
-#define MIN(a,b) ({ int _a = a; int _b = b; (_a < _b) ? _a : _b; })
-
+/* This MIN is more generic but not as portable
+ * #define MIN(a,b) ({ int _a = a; int _b = b; (_a < _b) ? _a : _b; })
+ */
+#define MIN(a,b) ((a)<(b)?(a):(b))
 
 static char *tracefifo_stat_buffer = 0;
@@ -207 +209 @@
 static int tracefifo_read_generic(struct tracefifo_t *fifo, void *buffer, size_t len, enum which_t which, char update) {
         size_t oldptr;
-        int lenleft;
+        size_t lenleft;
         int size;
         assert(fifo);
@@ -232 +234 @@
 int tracefifo_write(struct tracefifo_t *fifo, void *buffer, size_t len) {
         int lenleft;
-        int size;
+        size_t size;
         assert(fifo);
         assert(buffer);

lib/format_erf.c

@@ -115 +115 @@
                 char *path;
         } conn_info;
-
-
 
         union {

lib/rt_protocol.h

@@ -72 +72 @@
 } rt_end_data_t;
 
-typedef struct rt_close {
+ typedef struct rt_close {
 
-} rt_close_t;
+} rt_close_t;