Author: rhuijben
Date: Mon Nov 23 11:25:34 2015
New Revision: 1715768
URL: http://svn.apache.org/viewvc?rev=1715768&view=rev
Log:
Resolve more issues identified by clang.
* incoming.c
(perform_peek_protocol): Mark static.
* outgoing.c
(serf_connection_create): Really initialize variable.
* pump.c
(pump_cleanup): Mark static.
(socket_writev): Cast sizes to right printf value as used.
Modified:
serf/trunk/buckets/fcgi_buckets.c
serf/trunk/incoming.c
serf/trunk/outgoing.c
serf/trunk/pump.c
Modified: serf/trunk/buckets/fcgi_buckets.c
URL:
http://svn.apache.org/viewvc/serf/trunk/buckets/fcgi_buckets.c?rev=1715768&r1=1715767&r2=1715768&view=diff
==============================================================================
--- serf/trunk/buckets/fcgi_buckets.c (original)
+++ serf/trunk/buckets/fcgi_buckets.c Mon Nov 23 11:25:34 2015
@@ -248,7 +248,7 @@ static apr_status_t serf_fcgi_unframe_se
return serf_bucket_set_config(ctx->stream, config);
}
-extern const serf_bucket_type_t serf_bucket_type__fcgi_unframe =
+const serf_bucket_type_t serf_bucket_type__fcgi_unframe =
{
"FCGI-UNFRAME",
serf_fcgi_unframe_read,
@@ -887,7 +887,7 @@ static apr_status_t serf_fcgi_frame_set_
return APR_SUCCESS;
}
-extern const serf_bucket_type_t serf_bucket_type__fcgi_frame =
+const serf_bucket_type_t serf_bucket_type__fcgi_frame =
{
"FCGI-FRAME",
serf_fcgi_frame_read,
Modified: serf/trunk/incoming.c
URL:
http://svn.apache.org/viewvc/serf/trunk/incoming.c?rev=1715768&r1=1715767&r2=1715768&view=diff
==============================================================================
--- serf/trunk/incoming.c (original)
+++ serf/trunk/incoming.c Mon Nov 23 11:25:34 2015
@@ -137,7 +137,7 @@ apr_status_t serf_incoming_response_crea
return request->enqueue_response(request, request->enqueue_baton, bucket);
}
-apr_status_t perform_peek_protocol(serf_incoming_t *client)
+static apr_status_t perform_peek_protocol(serf_incoming_t *client)
{
const char h2prefix[] = "PRI * HTTP/2.0\r\n\r\n";
const apr_size_t h2prefixlen = sizeof(h2prefix) - 1;
Modified: serf/trunk/outgoing.c
URL:
http://svn.apache.org/viewvc/serf/trunk/outgoing.c?rev=1715768&r1=1715767&r2=1715768&view=diff
==============================================================================
--- serf/trunk/outgoing.c (original)
+++ serf/trunk/outgoing.c Mon Nov 23 11:25:34 2015
@@ -1288,7 +1288,7 @@ serf_connection_t *serf_connection_creat
conn->nr_of_written_reqs = 0;
conn->unwritten_reqs = conn->unwritten_reqs_tail = NULL;
- conn->nr_of_unwritten_reqs;
+ conn->nr_of_unwritten_reqs = 0;
conn->done_reqs = conn->done_reqs_tail = 0;
Modified: serf/trunk/pump.c
URL:
http://svn.apache.org/viewvc/serf/trunk/pump.c?rev=1715768&r1=1715767&r2=1715768&view=diff
==============================================================================
--- serf/trunk/pump.c (original)
+++ serf/trunk/pump.c Mon Nov 23 11:25:34 2015
@@ -29,7 +29,7 @@
#include "serf_private.h"
-apr_status_t pump_cleanup(void *baton)
+static apr_status_t pump_cleanup(void *baton)
{
serf_pump_t *pump = baton;
@@ -233,26 +233,30 @@ static apr_status_t socket_writev(serf_p
serf__log(LOGLVL_DEBUG, LOGCOMP_CONN, __FILE__, conn->config,
"--- socket_sendv: %d bytes on 0x%p. --\n",
- written, pump->io->u.v);
+ (int)written, pump->io->u.v);
for (i = 0; i < conn->vec_len; i++) {
len += conn->vec[i].iov_len;
if (written < len) {
serf__log_nopref(LOGLVL_DEBUG, LOGCOMP_RAWMSG, conn->config,
- "%.*s", conn->vec[i].iov_len - (len -
written),
+ "%.*s",
+ (int)(conn->vec[i].iov_len - (len - written)),
conn->vec[i].iov_base);
if (i) {
memmove(conn->vec, &conn->vec[i],
sizeof(struct iovec) * (conn->vec_len - i));
conn->vec_len -= i;
}
- conn->vec[0].iov_base = (char *)conn->vec[0].iov_base +
(conn->vec[0].iov_len - (len - written));
+ conn->vec[0].iov_base = (char *)conn->vec[0].iov_base
+ + conn->vec[0].iov_len
+ - (len - written);
conn->vec[0].iov_len = len - written;
break;
} else {
serf__log_nopref(LOGLVL_DEBUG, LOGCOMP_RAWMSG, conn->config,
"%.*s",
- conn->vec[i].iov_len, conn->vec[i].iov_base);
+ (int)conn->vec[i].iov_len,
+ (const char*)conn->vec[i].iov_base);
}
}
if (len == written) {
