Changeset 6d3f99b

Timestamp:

07/28/10 10:59:38 (10 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:

2317d78

Parents:

f724640

Message:

• Fixed more warnings about signed vs unsigned

Location:

lib

Files:

• ior-bzip.c (modified) (1 diff)
• iow-bzip.c (modified) (1 diff)
• iow-lzo.c (modified) (5 diffs)

lib/ior-bzip.c

@@ -115 +115 @@
                                 DATA(io)->err = ERR_ERROR;
                                 /* Return how much data we managed to read ok */
-                                if (DATA(io)->strm.avail_out != len) {
+                                if (DATA(io)->strm.avail_out != (uint32_t)len) {
                                         return len-DATA(io)->strm.avail_out;
                                 }

lib/iow-bzip.c

@@ -111 +111 @@
                                 DATA(iow)->err = ERR_ERROR;
                                 /* Return how much data we managed to write ok */
-                                if (DATA(iow)->strm.avail_in != len) {
+                                if (DATA(iow)->strm.avail_in != (uint32_t)len) {
                                         return len-DATA(iow)->strm.avail_in;
                                 }

lib/iow-lzo.c

@@ -59 +59 @@
 #include <sys/prctl.h>
 #endif
+
+#include "libtrace.h"
 
 enum { 
@@ -270 +272 @@
 }
 
-iow_t *lzo_wopen(iow_t *child, int compress_level)
+iow_t *lzo_wopen(iow_t *child, int compress_level UNUSED)
 {
         const int opt_filter = 0;
@@ -340 +342 @@
 
         /* Set up the thread pool -- one thread per core */
-        DATA(iow)->threads = min(sysconf(_SC_NPROCESSORS_ONLN),use_threads);
+        DATA(iow)->threads = min((uint32_t)sysconf(_SC_NPROCESSORS_ONLN),
+                        use_threads);
         DATA(iow)->thread = malloc(
                         sizeof(struct lzothread_t) * DATA(iow)->threads);
@@ -371 +374 @@
         off_t ret = 0;
         while (len>0) {
-                unsigned int size = len;
+                off_t size = len;
                 off_t err;
                 struct buffer_t outbuf;
@@ -425 +428 @@
                         space = MAX_BLOCK_SIZE-get_next_thread(iow)->inbuf.offset;
                         size = min(space, size);
-
                         assert(size>0);
                         assert(size <= MAX_BLOCK_SIZE);