Changeset 2060

Timestamp:

01/18/2008 03:19:01 PM (4 months ago)

Author:

glen

Message:

- fix printf format warnings. Stefan Buhler

Files:

• trunk/src/connections.c (modified) (1 diff)
• trunk/src/http_req.c (modified) (1 diff)
• trunk/src/mod_chunked.c (modified) (1 diff)
• trunk/src/mod_compress.c (modified) (3 diffs)
• trunk/src/mod_deflate.c (modified) (7 diffs)
• trunk/src/mod_flv_streaming.c (modified) (1 diff)
• trunk/src/mod_proxy_backend_ajp13.c (modified) (1 diff)
• trunk/src/mod_proxy_backend_fastcgi.c (modified) (1 diff)
• trunk/src/mod_proxy_core.c (modified) (3 diffs)
• trunk/src/mod_secure_download.c (modified) (1 diff)
• trunk/src/mod_uploadprogress.c (modified) (1 diff)
• trunk/src/network_gthread_aio.c (modified) (2 diffs)
• trunk/src/network_gthread_sendfile.c (modified) (1 diff)
• trunk/src/network_posix_aio.c (modified) (1 diff)
• trunk/src/server.c (modified) (1 diff)

trunk/src/connections.c

@@ -1339 +1339 @@
-                                        
-                                        if (cq_len > 0) {
-
+, cq_len
-                                        }
-                                }

trunk/src/http_req.c

@@ -185 +185 @@
-                                t->offset == t->lookup_offset + 1) {
-
-t->
+
-                                return PARSER_ERROR;
-                        }

trunk/src/mod_chunked.c

@@ -203 +203 @@
-        }
-        if(con->response.content_length >= 0) {
-d
+ju
-                use_chunked = 0;
-        } else if (con->request.http_method != HTTP_METHOD_HEAD) {

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) {
-l
+j
-                                BUF_STR(con->physical.path), 
-                                sce->st.st_size);
@@ -659 +659 @@
-        /* compressing the file might lead to larger files instead */
-        if (sce->st.st_size < 128) {
-l
+j
-                                BUF_STR(con->physical.path), 
-                                sce->st.st_size);
@@ -693 +693 @@
-
-        if (con->send->first == NULL) {
-con->send->first
+NULL
-                return HANDLER_GO_ON;
-        }
-
-        if (con->send->first->next != NULL) {
-con->send->first->next
+NULL
-                return HANDLER_GO_ON;
-        }

trunk/src/mod_deflate.c

@@ -880 +880 @@
-        if (mod_deflate_compress(srv, con, hctx,
-                                (unsigned char *)start + (abs_offset - c->file.mmap.offset), toSend) < 0) {
-compress failed.", 0
+%s", "compress failed."
-                return -1;
-        }
@@ -953 +953 @@
-
-                        if (mod_deflate_compress(srv, con, hctx, (unsigned char *)(c->mem->ptr + c->offset), we_want) < 0) {
-compress failed.", 0
+%s", "compress failed."
-                                return HANDLER_ERROR;
-                        }
@@ -967 +967 @@
-                        
-                        if ((we_want = mod_deflate_file_chunk(srv, con, hctx, c, we_want)) < 0) {
-compress file chunk failed.", 0
+%s", "compress file chunk failed."
-                                return HANDLER_ERROR;
-                        }
@@ -1019 +1019 @@
-
-        if (rc < 0) {
-flush error", 0
+%s", "flush error"
-        }
-        
@@ -1125 +1125 @@
-        if(!p->conf.enabled) {
-                if(p->conf.debug) {
-compression disabled.", 0
+%s", "compression disabled."
-                }
-                return HANDLER_GO_ON;
@@ -1174 +1174 @@
-        fl = filter_chain_get_filter(con->send_filters, p->id);
-        if (!fl) {
-add deflate filter to filter chain", 0
+%s", "add deflate filter to filter chain"
-                fl = filter_chain_create_filter(con->send_filters, p->id);
-        }
@@ -1213 +1213 @@
-
-                        if(p->conf.debug) {
-
+ %s
-                        }
-                        if (strncmp(mimetype->value->ptr, ds->value->ptr, mimetype->value->used-1) == 0) {

trunk/src/mod_flv_streaming.c

@@ -213 +213 @@
-                        stat_cache_entry *sce = NULL;
-                        buffer *b;
-int
+long
-                        char *err = NULL;
-                        /* if there is a start=[0-9]+ in the header use it as start,

trunk/src/mod_proxy_backend_ajp13.c

@@ -303 +303 @@
-        if (p == NULL) {
-                if ((data->buf->used - data->offset) <= (len + 1)) {
-d bytes, but a partial-string wants %d
+ju bytes, but a partial-string wants %zu
-                        return -1;
-                }

trunk/src/mod_proxy_backend_fastcgi.c

@@ -480 +480 @@
-                out->is_closed = 1;
-
-ld / %ld
+ju / %ju
-                                in->bytes_in, in->bytes_out,
-                                in->is_closed);

trunk/src/mod_proxy_core.c

@@ -1005 +1005 @@
-                 */
-
-
+
+
-        }
-
@@ -1445 +1446 @@
-                        TRACE("connecting to address %s (%p) failed, disabling for 60 sec", 
-                                        BUF_STR(sess->proxy_con->address->name),
-
+(void*) 
-                        COUNTER_INC(sess->proxy_backend->requests_failed);
-
@@ -1475 +1476 @@
-                        case PROXY_CONNECTION_STATE_CONNECTING:
-                                if (0 != getsockopt(sess->proxy_con->sock->fd, SOL_SOCKET, SO_ERROR, &socket_error, &socket_error_len)) {
-
+ %s
-        
-                                        return HANDLER_ERROR;

trunk/src/mod_secure_download.c

@@ -279 +279 @@
-            srv->cur_ts - ts < -p->conf.timeout) {
-                if (con->conf.log_request_handling) {
-
+l
-                }
-

trunk/src/mod_uploadprogress.c

@@ -535 +535 @@
-
-        if (p->conf.debug) {
-
+ (void*) 
-                        con->request.http_method, con->http_status);
-        }

trunk/src/network_gthread_aio.c

@@ -66 +66 @@
-        if (!srv->srvconf.log_timing) return;
-
-d.%06
-
-
-
+ld.%06l
+l
+l
+l
-               con->timestamps[TIME_SEND_WRITE_START].tv_sec,
-               con->timestamps[TIME_SEND_WRITE_START].tv_usec,
@@ -386 +386 @@
-                                                        return NETWORK_STATUS_FATAL_ERROR;
-                                                } else if (r != c->file.copy.length) {
-d
+ju
-                        
-                                                        return NETWORK_STATUS_FATAL_ERROR;

trunk/src/network_gthread_sendfile.c

@@ -57 +57 @@
-        if (!srv->srvconf.log_timing) return;
-
-d.%06
-
-
-
+ld.%06l
+l
+l
+l
-               con->timestamps[TIME_SEND_WRITE_START].tv_sec,
-               con->timestamps[TIME_SEND_WRITE_START].tv_usec,

trunk/src/network_posix_aio.c

@@ -351 +351 @@
-
-                                                if (r != c->file.copy.length) {
-d
+ju
-
-                                                        return NETWORK_STATUS_FATAL_ERROR;

trunk/src/server.c

@@ -985 +985 @@
-
-                } else if (n < 0 && poll_errno != EINTR) {
-
+ %s
-                }
-