Changeset 2131

Timestamp:

03/20/2008 05:33:22 PM (6 months ago)

Author:

stbuehler

Message:

fix many (64-bit) format warnings and unsigned/signed compare warnings

Observations:

• 32-bit platform (linux):
  • size_t: 32-bit unsigned
  • ssize_t: 32-bit signed (should always be the same size as size_t)
  • off_t: 64-bit signed (should be always signed)

(it is 64 bit as we use LARGE_FILE options, without we couldn't handle files > 4GB)

• 64-bit platform:
  • size_t: 64-bit unsigned
  • ssize_t: 64-bit signed
  • off_t: 64-bit signed

Fixes:

• off_t will be casted to (intmax_t) and formatted with "%jd"
• size_t gets formatted with "%zu"
• ssize_t gets formatted witz "%zd"
• off_t/size_t comparisons: This is no problem if off_t is bigger then size_t; the compiler will just case size_t to off_t which is no problem in that case.

Now, on 64-bit they have the same size but differ in signedness; i cast
size_t to off_t manually anyway and just hope, that no one is using such big
numbers (on 64-bit this is a really big number).
This was mostly in mmap code, and as we only mmap small chunks i don't think this
is a problem.

Location:

trunk

Files:

• NEWS (modified) (1 diff)
• src/connections.c (modified) (1 diff)
• src/fdevent_poll.c (modified) (1 diff)
• src/http-header-glue.c (modified) (1 diff)
• src/http_req.c (modified) (2 diffs)
• src/http_req_range_test.c (modified) (8 diffs)
• src/lempar.c (modified) (4 diffs)
• src/mod_accesslog.c (modified) (3 diffs)
• src/mod_chunked.c (modified) (2 diffs)
• src/mod_compress.c (modified) (2 diffs)
• src/mod_deflate.c (modified) (8 diffs)
• src/mod_postgresql_vhost.c (modified) (2 diffs)
• src/mod_proxy_backend_ajp13.c (modified) (3 diffs)
• src/mod_proxy_backend_fastcgi.c (modified) (1 diff)
• src/mod_uploadprogress.c (modified) (1 diff)
• src/network_gthread_aio.c (modified) (4 diffs)
• src/network_gthread_sendfile.c (modified) (1 diff)
• src/network_linux_sendfile.c (modified) (1 diff)
• src/network_openssl.c (modified) (8 diffs)
• src/network_posix_aio.c (modified) (4 diffs)
• src/network_writev.c (modified) (1 diff)
• src/request.c (modified) (1 diff)
• src/server.c (modified) (2 diffs)

trunk/NEWS

@@ -22 +22 @@
   * mod_cgi: add a event-handler for STDERR_FILENO and log it with ERROR()
   * fixed building/testing outside of the src dir
+  * fix many (64-bit) format warnings and unsigned/signed compare warnings
 
 - 1.5.0-r19.. -

trunk/src/connections.c

@@ -1339 +1339 @@
                                         
                                         if (cq_len > 0) {
-                                                TRACE("filter[%d] is not empty: %lld (report me)", f->id, cq_len);
+                                                TRACE("filter[%d] is not empty: %jd (report me)", f->id, (intmax_t) cq_len);
                                         }
                                 }

trunk/src/fdevent_poll.c

@@ -117 +117 @@
                         if (ev->pollfds[ndx].revents & POLLNVAL) {
                                 /* should never happen */
-                                SEGFAULT("ev->pollfds[%d].revents has POLLNVAL", ndx);
+                                SEGFAULT("ev->pollfds[%zu].revents has POLLNVAL", ndx);
                         }
 

trunk/src/http-header-glue.c

@@ -280 +280 @@
                                                 /* check if we can safely copy the string */
                                                 if (used_len >= sizeof(buf)) {
-                                                        TRACE("last-mod check failed as timestamp was too long: %s: %d, %d",
+                                                        TRACE("last-mod check failed as timestamp was too long: %s: %zu, %zu",
                                                                         BUF_STR(http_if_modified_since->value),
                                                                         used_len, sizeof(buf) - 1);

trunk/src/http_req.c

@@ -158 +158 @@
                                 t->is_key = 1;
                         } else {
-                                ERROR("CR with out LF at pos: %d", t->offset);
+                                ERROR("CR with out LF at pos: %zu", t->offset);
                                 return PARSER_ERROR;
                         }
@@ -185 +185 @@
                                 t->offset == t->lookup_offset + 1) {
 
-                                ERROR("invalid char (%d) at pos: %d", c, t->offset);
+                                ERROR("invalid char (%d) at pos: %zu", c, t->offset);
                                 return PARSER_ERROR;
                         }

trunk/src/http_req_range_test.c

@@ -2 +2 @@
 #include <assert.h>
 #include <string.h>
+#include <stdint.h>
 
 #include <tap.h>
@@ -18 +19 @@
         ok(PARSE_SUCCESS == http_request_range_parse(b, ranges), "0-0");
         for (r = ranges; r; r = r->next) {
-                diag(".. %lld - %lld", r->start, r->end);
+                diag(".. %jd - %jd", (intmax_t) r->start, (intmax_t) r->end);
         }
         http_request_range_reset(ranges);
@@ -25 +26 @@
         ok(PARSE_SUCCESS == http_request_range_parse(b, ranges), "1-2,3-4");
         for (r = ranges; r; r = r->next) {
-                diag(".. %lld - %lld", r->start, r->end);
+                diag(".. %jd - %jd", (intmax_t) r->start, (intmax_t) r->end);
         }
         http_request_range_reset(ranges);
@@ -32 +33 @@
         ok(PARSE_SUCCESS == http_request_range_parse(b, ranges), "-0");
         for (r = ranges; r; r = r->next) {
-                diag(".. %lld - %lld", r->start, r->end);
+                diag(".. %jd - %jd", (intmax_t) r->start, (intmax_t) r->end);
         }
         http_request_range_reset(ranges);
@@ -39 +40 @@
         ok(PARSE_SUCCESS == http_request_range_parse(b, ranges), "0-");
         for (r = ranges; r; r = r->next) {
-                diag(".. %lld - %lld", r->start, r->end);
+                diag(".. %jd - %jd", (intmax_t) r->start, (intmax_t) r->end);
         }
         http_request_range_reset(ranges);
@@ -46 +47 @@
         ok(PARSE_SUCCESS == http_request_range_parse(b, ranges), "0-0,0-");
         for (r = ranges; r; r = r->next) {
-                diag(".. %lld - %lld", r->start, r->end);
+                diag(".. %jd - %jd", (intmax_t) r->start, (intmax_t) r->end);
         }
         http_request_range_reset(ranges);
@@ -53 +54 @@
         ok(PARSE_SUCCESS == http_request_range_parse(b, ranges), "0-0,-0");
         for (r = ranges; r; r = r->next) {
-                diag(".. %lld - %lld", r->start, r->end);
+                diag(".. %jd - %jd", (intmax_t) r->start, (intmax_t) r->end);
         }
         http_request_range_reset(ranges);
@@ -60 +61 @@
         ok(PARSE_SUCCESS == http_request_range_parse(b, ranges), "1-2,3-4,5-");
         for (r = ranges; r; r = r->next) {
-                diag(".. %lld - %lld", r->start, r->end);
+                diag(".. %jd - %jd", (intmax_t) r->start, (intmax_t) r->end);
         }
 

trunk/src/lempar.c

@@ -211 +211 @@
 const char *ParseTokenName(int tokenType){
 #ifndef NDEBUG
-  if( tokenType>0 && ((unsigned int)tokenType)<(sizeof(yyTokenName)/sizeof(yyTokenName[0])) ){
+  if( tokenType>0 && ((size_t)tokenType)<(sizeof(yyTokenName)/sizeof(yyTokenName[0])) ){
     return yyTokenName[tokenType];
   }else{
@@ -336 +336 @@
   }
   i += iLookAhead;
-  if( i<0 || (unsigned int)i>=YY_SZ_ACTTAB || yy_lookahead[i]!=iLookAhead ){
+  if( i<0 || (size_t)i>=YY_SZ_ACTTAB || yy_lookahead[i]!=iLookAhead ){
 #ifdef YYFALLBACK
     int iFallback;            /* Fallback token */
@@ -379 +379 @@
   }
   i += iLookAhead;
-  if( i<0 || (unsigned int)i>=YY_SZ_ACTTAB || yy_lookahead[i]!=iLookAhead ){
+  if( i<0 || (size_t)i>=YY_SZ_ACTTAB || yy_lookahead[i]!=iLookAhead ){
     return yy_default[stateno];
   }else{
@@ -457 +457 @@
 #ifndef NDEBUG
   if( yyTraceFILE && yyruleno>=0
-        && (unsigned int) yyruleno<sizeof(yyRuleName)/sizeof(yyRuleName[0]) ){
+        && (size_t) yyruleno<sizeof(yyRuleName)/sizeof(yyRuleName[0]) ){
     fprintf(yyTraceFILE, "%sReduce [%s].\n", yyTracePrompt,
       yyRuleName[yyruleno]);

trunk/src/mod_accesslog.c

@@ -343 +343 @@
 # ifdef HAVE_SYSLOG_H
                                         if (s->access_logbuffer->used > 2) {
-                                                syslog(LOG_INFO, "%*s", s->access_logbuffer->used - 2, s->access_logbuffer->ptr);
+                                                syslog(LOG_INFO, "%*s", (int) s->access_logbuffer->used - 2, s->access_logbuffer->ptr);
                                         }
 # endif
@@ -547 +547 @@
                                 if (s->access_logbuffer->used > 2) {
                                         /* syslog appends a \n on its own */
-                                        syslog(LOG_INFO, "%*s", s->access_logbuffer->used - 2, s->access_logbuffer->ptr);
+                                        syslog(LOG_INFO, "%*s", (int) s->access_logbuffer->used - 2, s->access_logbuffer->ptr);
                                 }
 #endif
@@ -829 +829 @@
                         if (b->used > 2) {
                                 /* syslog appends a \n on its own */
-                                syslog(LOG_INFO, "%*s", b->used - 2, b->ptr);
+                                syslog(LOG_INFO, "%*s", (int) b->used - 2, b->ptr);
                         }
 #endif

trunk/src/mod_chunked.c

@@ -203 +203 @@
         }
         if(con->response.content_length >= 0) {
-                if (p->conf.debug > 0) TRACE("response content length known, disabling chunked encoding.  len=%ju", con->response.content_length);
+                if (p->conf.debug > 0) TRACE("response content length known, disabling chunked encoding.  len=%jd", (intmax_t) con->response.content_length);
                 use_chunked = 0;
         } else if (con->request.http_method != HTTP_METHOD_HEAD) {
@@ -347 +347 @@
         }
 
-        if (hctx->debug > 1) TRACE("chunk encoded: in=%lld, out=%lld", in->bytes_out, out->bytes_in);
+        if (hctx->debug > 1) TRACE("chunk encoded: in=%jd, out=%jd", (intmax_t) in->bytes_out, (intmax_t) out->bytes_in);
 
         chunkqueue_remove_finished_chunks(in);

trunk/src/mod_compress.c

@@ -650 +650 @@
         /* don't compress files that are too large as we need to much time to handle them */
         if (max_fsize && (sce->st.st_size >> 10) > max_fsize) {
-                if (con->conf.log_request_handling) TRACE("file '%s' is too large: %ju", 
+                if (con->conf.log_request_handling) TRACE("file '%s' is too large: %jd", 
                                 BUF_STR(con->physical.path), 
-                                sce->st.st_size);
+                                (intmax_t) sce->st.st_size);
 
                 return HANDLER_GO_ON;
@@ -659 +659 @@
         /* compressing the file might lead to larger files instead */
         if (sce->st.st_size < 128) {
-                if (con->conf.log_request_handling) TRACE("file '%s' is too small: %ju", 
+                if (con->conf.log_request_handling) TRACE("file '%s' is too small: %jd", 
                                 BUF_STR(con->physical.path), 
-                                sce->st.st_size);
+                                (intmax_t) sce->st.st_size);
 
                 return HANDLER_GO_ON;

trunk/src/mod_deflate.c

@@ -104 +104 @@
 
 typedef struct {
-        int bytes_in;
+        off_t bytes_in;
         filter *fl;
         chunkqueue *in;
@@ -360 +360 @@
                         buffer_copy_memory(hctx->output, gzip_header, sizeof(gzip_header));
                         if(p->conf.debug) {
-                                TRACE("gzip_header len=%i", sizeof(gzip_header));
+                                TRACE("gzip_header len=%zu", sizeof(gzip_header));
                         }
                         /* initialize crc32 */
@@ -753 +753 @@
         off_t toSend;
         stat_cache_entry *sce = NULL;
-        off_t we_want_to_mmap = 2 MByte; 
-        off_t we_want_to_send = st_size;
+        size_t we_want_to_mmap = 2 MByte; 
+        size_t we_want_to_send = st_size;
         char *start = NULL;
 
@@ -766 +766 @@
         
         if (c->file.length + c->file.start > sce->st.st_size) {
-                ERROR("file '%s' was shrinked: was %lld, is %lld (%lld, %lld)", 
-                                BUF_STR(c->file.name), c->file.length + c->file.start, sce->st.st_size,
-                                c->file.start, c->offset);
+                ERROR("file '%s' was shrinked: was %ju, is %ju (%ju, %ju)", 
+                                BUF_STR(c->file.name), (intmax_t) c->file.length + c->file.start, (intmax_t) sce->st.st_size,
+                                (intmax_t) c->file.start, (intmax_t) c->offset);
                 
                 return -1;
@@ -812 +812 @@
                         c->file.mmap.offset = 0;
 
-                        while (c->file.mmap.offset + we_want_to_mmap < c->file.start) {
+                        while (c->file.mmap.offset + (off_t) we_want_to_mmap < c->file.start) {
                                 c->file.mmap.offset += we_want_to_mmap;
                         }
@@ -858 +858 @@
         /* to_send = abs_mmap_end - abs_offset */
         toSend = (c->file.mmap.offset + c->file.mmap.length) - (abs_offset);
-        if(toSend > we_want_to_send) toSend = we_want_to_send;
+        if (toSend > (off_t) we_want_to_send) toSend = we_want_to_send;
 
         if (toSend < 0) {
@@ -898 +898 @@
 
         if(p->conf.debug && hctx->bytes_in < hctx->out->bytes_in) {
-                TRACE("compressing uri '%s' increased the sent content-size from %i to %lld",
-                        BUF_STR(con->uri.path_raw), hctx->bytes_in, hctx->out->bytes_in);
+                TRACE("compressing uri '%s' increased the sent content-size from %jd to %jd",
+                        BUF_STR(con->uri.path_raw), (intmax_t) hctx->bytes_in, (intmax_t) hctx->out->bytes_in);
         }
 
@@ -1012 +1012 @@
 
         if (p->conf.debug) {
-                TRACE("end: %d - %lld - %lld", hctx->in->is_closed, hctx->in->bytes_in, hctx->in->bytes_out);
+                TRACE("end: %d - %jd - %jd", hctx->in->is_closed, (intmax_t) hctx->in->bytes_in, (intmax_t) hctx->in->bytes_out);
         }
 

trunk/src/mod_postgresql_vhost.c

@@ -220 +220 @@
         gchar *field;
 
+        UNUSED(host);
+
         /* no host specified? */
         if (buffer_is_empty(con->uri.authority)) return HANDLER_ERROR;
@@ -259 +261 @@
 
                 if (PQstatus(p->conf.conn) != CONNECTION_OK){
-                        ERROR("PQconnectdb() failed: %s", PQstatus(p->conf.conn));
+                        ERROR("PQconnectdb() failed: %i", PQstatus(p->conf.conn));
 
                         PQfinish(p->conf.conn);

trunk/src/mod_proxy_backend_ajp13.c

@@ -282 +282 @@
         len = ajp13_decode_int(data);
         if ((ssize_t)len == -1) {
-                ERROR("ajp13_decode_int() returned invalid len: %d", len);
+                ERROR("ajp13_decode_int() returned invalid len: %zu", len);
                 return len;
         }
 #ifdef AJP13_DEBUG
-        TRACE("ajp13_decode_string() string-len: %d (is_header: %d, common-header: %d)", len, is_header, (len & AJP13_COMMON_HEADER_CODE));
+        TRACE("ajp13_decode_string() string-len: %zu (is_header: %d, common-header: %zd)", len, is_header, (len & AJP13_COMMON_HEADER_CODE));
 #endif
 
@@ -295 +295 @@
                         len = strlen(p);
                 } else {
-                        ERROR("ajp13_decode_string() can't resolve common-header: %d", len & ~AJP13_COMMON_HEADER_CODE);
+                        ERROR("ajp13_decode_string() can't resolve common-header: %zd", len & ~AJP13_COMMON_HEADER_CODE);
 
                         return -1;
@@ -303 +303 @@
         if (p == NULL) {
                 if ((data->buf->used - data->offset) <= (len + 1)) {
-                        ERROR("we have %ju bytes, but a partial-string wants %zu. no way", (data->buf->used - data->offset), len);
+                        ERROR("we have %jd bytes, but a partial-string wants %zu. no way", (intmax_t) (data->buf->used - data->offset), len);
                         return -1;
                 }

trunk/src/mod_proxy_backend_fastcgi.c

@@ -480 +480 @@
                 out->is_closed = 1;
 
-                TRACE("%ju / %ju -> %d", 
-                                in->bytes_in, in->bytes_out,
+                TRACE("%jd / %jd -> %d", 
+                                (intmax_t) in->bytes_in, (intmax_t) in->bytes_out,
                                 in->is_closed);
 

trunk/src/mod_uploadprogress.c

@@ -260 +260 @@
 
         if (b->used != 32 + 1) {
-                if (p->conf.debug) ERROR("the Progress-ID has to be 32 characters long, got %d characters", b->used - 1);
+                if (p->conf.debug) ERROR("the Progress-ID has to be 32 characters long, got %zd characters", b->used - 1);
                 return NULL;
         }

trunk/src/network_gthread_aio.c

@@ -250 +250 @@
 
                         /* check which chunks are finished now */
-                        for (tc = c; tc; tc = tc->next) {
-                                /* finished the chunk */
-                                if (tc->offset == tc->mem->used - 1) {
-                                        /* skip the first c->next as that will be done by the c = c->next in the other for()-loop */
-                                        if (chunk_finished) {
-                                                c = c->next;
-                                        } else {
-                                                chunk_finished = 1;
-                                        }
+                        for (tc = c; tc && chunk_is_done(tc); tc = tc->next) {
+                                /* skip the first c->next as that will be done by the c = c->next in the other for()-loop */
+                                if (chunk_finished) {
+                                        c = c->next;
                                 } else {
-                                        break;
+                                        chunk_finished = 1;
                                 }
                         }
@@ -386 +381 @@
                                                         return NETWORK_STATUS_FATAL_ERROR;
                                                 } else if (r != c->file.copy.length) {
-                                                        ERROR("read() returned %d instead of %ju", r, c->file.copy.length);
+                                                        ERROR("read() returned %zd instead of %jd", r, (intmax_t) c->file.copy.length);
                         
                                                         return NETWORK_STATUS_FATAL_ERROR;
@@ -421 +416 @@
                                         return NETWORK_STATUS_CONNECTION_CLOSE;
                                 default:
-                                        ERROR("write failed: %d (%s) [%lld, %p, %lld]", 
-                                                        errno, strerror(errno), c->file.copy.length, c->file.mmap.start, c->file.copy.offset);
+                                        ERROR("write failed: %d (%s) [%jd, %p, %jd]", 
+                                                        errno, strerror(errno), (intmax_t) c->file.copy.length,
+                                                        c->file.mmap.start, (intmax_t) c->file.copy.offset);
                                         return NETWORK_STATUS_FATAL_ERROR;
                                 }
@@ -436 +432 @@
                         cq->bytes_out += r;
 
-                        if (c->file.mmap.length == c->file.copy.offset) {
+                        if (c->file.copy.offset == (off_t) c->file.mmap.length) {
                                 /* this block is sent, get a new one */
                                 timing_log(srv, con, TIME_SEND_WRITE_END);

trunk/src/network_gthread_sendfile.c

@@ -170 +170 @@
 
                         /* check which chunks are finished now */
-                        for (tc = c; tc; tc = tc->next) {
-                                /* finished the chunk */
-                                if (tc->offset == tc->mem->used - 1) {
-                                        /* skip the first c->next as that will be done by the c = c->next in the other for()-loop */
-                                        if (chunk_finished) {
-                                                c = c->next;
-                                        } else {
-                                                chunk_finished = 1;
-                                        }
+                        for (tc = c; tc && chunk_is_done(tc); tc = tc->next) {
+                                /* skip the first c->next as that will be done by the c = c->next in the other for()-loop */
+                                if (chunk_finished) {
+                                        c = c->next;
                                 } else {
-                                        break;
+                                        chunk_finished = 1;
                                 }
                         }

trunk/src/network_linux_sendfile.c

@@ -45 +45 @@
 
                         /* check which chunks are finished now */
-                        for (tc = c; tc; tc = tc->next) {
-                                /* finished the chunk */
-                                if (tc->offset == tc->mem->used - 1) {
-                                        /* skip the first c->next as that will be done by the c = c->next in the other for()-loop */
-                                        if (chunk_finished) {
-                                                c = c->next;
-                                        } else {
-                                                chunk_finished = 1;
-                                        }
+                        for (tc = c; tc && chunk_is_done(tc); tc = tc->next) {
+                                /* skip the first c->next as that will be done by the c = c->next in the other for()-loop */
+                                if (chunk_finished) {
+                                        c = c->next;
                                 } else {
-