Author: rhuijben
Date: Thu Nov 19 23:21:52 2015
New Revision: 1715305
URL: http://svn.apache.org/viewvc?rev=1715305&view=rev
Log:
Following up on r1715172, switch to using a normal %p for pointers while
logging. This code (by default) doesn't use the apr printf-like formatter
and just prints the final 'p'.
* incoming.c
(client_connected): Remove p.
* outgoing.c
(clean_conn): Remove p.
* pump.c
(no_more_writes,
socket_writev,
serf_pump__write): Remove p.
Modified:
serf/trunk/incoming.c
serf/trunk/outgoing.c
serf/trunk/pump.c
Modified: serf/trunk/incoming.c
URL:
http://svn.apache.org/viewvc/serf/trunk/incoming.c?rev=1715305&r1=1715304&r2=1715305&view=diff
==============================================================================
--- serf/trunk/incoming.c (original)
+++ serf/trunk/incoming.c Thu Nov 19 23:21:52 2015
@@ -38,7 +38,7 @@ static apr_status_t client_connected(ser
serf_pump__store_ipaddresses_in_config(&client->pump);
serf__log(LOGLVL_DEBUG, LOGCOMP_CONN, __FILE__, client->config,
- "socket for client 0x%pp connected\n", client);
+ "socket for client 0x%p connected\n", client);
/* ### Connection does auth setup here */
Modified: serf/trunk/outgoing.c
URL:
http://svn.apache.org/viewvc/serf/trunk/outgoing.c?rev=1715305&r1=1715304&r2=1715305&view=diff
==============================================================================
--- serf/trunk/outgoing.c (original)
+++ serf/trunk/outgoing.c Thu Nov 19 23:21:52 2015
@@ -61,7 +61,7 @@ static apr_status_t clean_conn(void *dat
serf_connection_t *conn = data;
serf__log(LOGLVL_DEBUG, LOGCOMP_CONN, __FILE__, conn->config,
- "cleaning up connection 0x%pp\n", conn);
+ "cleaning up connection 0x%p\n", conn);
serf_connection_close(conn);
return APR_SUCCESS;
@@ -336,7 +336,7 @@ static apr_status_t connect_connection(s
serf_pump__store_ipaddresses_in_config(&conn->pump);
serf__log(LOGLVL_DEBUG, LOGCOMP_CONN, __FILE__, conn->config,
- "socket for conn 0x%pp connected\n", conn);
+ "socket for conn 0x%p connected\n", conn);
/* If the authentication was already started on another connection,
prepare this connection (it might be possible to skip some
@@ -397,7 +397,7 @@ apr_status_t serf__open_connections(serf
#endif
conn->skt_pool);
serf__log(LOGLVL_DEBUG, LOGCOMP_CONN, __FILE__, conn->config,
- "created socket for conn 0x%pp, status %d\n", conn, status);
+ "created socket for conn 0x%p, status %d\n", conn, status);
if (status != APR_SUCCESS)
return status;
@@ -504,7 +504,7 @@ static apr_status_t reset_connection(ser
serf_request_t *old_reqs;
serf__log(LOGLVL_DEBUG, LOGCOMP_CONN, __FILE__, conn->config,
- "reset connection 0x%pp\n", conn);
+ "reset connection 0x%p\n", conn);
conn->probable_keepalive_limit = conn->completed_responses;
conn->completed_requests = 0;
@@ -1054,7 +1054,7 @@ error:
disable pipelining and reconnect to the server. */
serf__log(LOGLVL_WARNING, LOGCOMP_CONN, __FILE__, conn->config,
"The server requested renegotiation. Disable HTTP "
- "pipelining and reset the connection 0x%pp.\n", conn);
+ "pipelining and reset the connection 0x%p.\n", conn);
serf__connection_set_pipelining(conn, 0);
reset_connection(conn, 1);
@@ -1363,7 +1363,7 @@ apr_status_t serf_connection_create2(
*conn = c;
serf__log(LOGLVL_DEBUG, LOGCOMP_CONN, __FILE__, c->config,
- "created connection 0x%pp\n", c);
+ "created connection 0x%p\n", c);
return status;
}
@@ -1429,7 +1429,7 @@ apr_status_t serf_connection_close(
--ctx->conns->nelts;
serf__log(LOGLVL_DEBUG, LOGCOMP_CONN, __FILE__, conn->config,
- "closed connection 0x%pp\n", conn);
+ "closed connection 0x%p\n", conn);
/* Found the connection. Closed it. All done. */
return APR_SUCCESS;
Modified: serf/trunk/pump.c
URL:
http://svn.apache.org/viewvc/serf/trunk/pump.c?rev=1715305&r1=1715304&r2=1715305&view=diff
==============================================================================
--- serf/trunk/pump.c (original)
+++ serf/trunk/pump.c Thu Nov 19 23:21:52 2015
@@ -202,7 +202,7 @@ static apr_status_t no_more_writes(serf_
/* Note that we should hold new requests until we open our new socket. */
pump->done_writing = true;
serf__log(LOGLVL_DEBUG, LOGCOMP_CONN, __FILE__, pump->config,
- "stop writing on 0x%pp\n", pump->io->u.v);
+ "stop writing on 0x%p\n", pump->io->u.v);
/* Clear our iovec. */
pump->vec_len = 0;
@@ -224,7 +224,7 @@ static apr_status_t socket_writev(serf_p
pump->vec_len, &written);
if (status && !APR_STATUS_IS_EAGAIN(status))
serf__log(LOGLVL_DEBUG, LOGCOMP_CONN, __FILE__, pump->config,
- "socket_sendv error %d on 0x%pp\n", status, pump->io->u.v);
+ "socket_sendv error %d on 0x%p\n", status, pump->io->u.v);
/* did we write everything? */
if (written) {
@@ -232,7 +232,7 @@ static apr_status_t socket_writev(serf_p
int i;
serf__log(LOGLVL_DEBUG, LOGCOMP_CONN, __FILE__, conn->config,
- "--- socket_sendv: %d bytes on 0x%pp. --\n",
+ "--- socket_sendv: %d bytes on 0x%p. --\n",
written, pump->io->u.v);
for (i = 0; i < conn->vec_len; i++) {
@@ -331,7 +331,7 @@ apr_status_t serf_pump__write(serf_pump_
serf__log(LOGLVL_INFO, LOGCOMP_CONN, __FILE__, pump->config,
"Output stream requested temporary write delay "
- "on 0x%pp\n", pump->io->u.v);
+ "on 0x%p\n", pump->io->u.v);
pump->stop_writing = true;
serf_io__set_pollset_dirty(pump->io);
