From de052ca6fc1c73e2857801a1bcf48c18910bec40 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Tue, 23 Jul 2013 15:59:07 +0200 Subject: string formatting: fix 25+ printf-style format strings --- lib/connect.c | 2 +- lib/ftp.c | 2 +- lib/hash.c | 4 ++-- lib/imap.c | 5 +++-- lib/memdebug.c | 36 +++++++++++++++++++++++++++--------- lib/multi.c | 4 ++-- lib/pipeline.c | 18 ++++++++++-------- lib/pop3.c | 2 +- lib/security.c | 4 ++-- lib/smtp.c | 2 +- lib/ssh.c | 2 +- lib/url.c | 9 +++++---- 12 files changed, 56 insertions(+), 34 deletions(-) (limited to 'lib') diff --git a/lib/connect.c b/lib/connect.c index be8c0e45a..2b5719d12 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -1144,7 +1144,7 @@ CURLcode Curl_connecthost(struct connectdata *conn, /* context */ if(sockfd == CURL_SOCKET_BAD) { /* no good connect was made */ - failf(data, "couldn't connect to %s at %s:%d", + failf(data, "couldn't connect to %s at %s:%ld", conn->bits.proxy?"proxy":"host", conn->bits.proxy?conn->proxy.name:conn->host.name, conn->port); return CURLE_COULDNT_CONNECT; diff --git a/lib/ftp.c b/lib/ftp.c index 021796f0a..318bfa75a 100644 --- a/lib/ftp.c +++ b/lib/ftp.c @@ -828,7 +828,7 @@ static void _state(struct connectdata *conn, #if defined(DEBUGBUILD) && !defined(CURL_DISABLE_VERBOSE_STRINGS) if(ftpc->state != newstate) infof(conn->data, "FTP %p (line %d) state change from %s to %s\n", - ftpc, lineno, names[ftpc->state], names[newstate]); + (void *)ftpc, lineno, names[ftpc->state], names[newstate]); #endif ftpc->state = newstate; } diff --git a/lib/hash.c b/lib/hash.c index 0a8e99ab2..4a12e1a7b 100644 --- a/lib/hash.c +++ b/lib/hash.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2012, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2013, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -391,7 +391,7 @@ void Curl_hash_print(struct curl_hash *h, if(func) func(he->ptr); else - fprintf(stderr, " [%p]", he->ptr); + fprintf(stderr, " [%p]", (void *)he->ptr); he = Curl_hash_next_element(&iter); } diff --git a/lib/imap.c b/lib/imap.c index b13bd3da7..3547a3467 100644 --- a/lib/imap.c +++ b/lib/imap.c @@ -77,6 +77,7 @@ #include "url.h" #include "rawstr.h" #include "curl_sasl.h" +#include "warnless.h" #define _MPRINTF_REPLACE /* use our functions only */ #include @@ -398,7 +399,7 @@ static void state(struct connectdata *conn, imapstate newstate) if(imapc->state != newstate) infof(conn->data, "IMAP %p state change from %s to %s\n", - imapc, names[imapc->state], names[newstate]); + (void *)imapc, names[imapc->state], names[newstate]); #endif imapc->state = newstate; @@ -2069,7 +2070,7 @@ static CURLcode imap_sendf(struct connectdata *conn, const char *fmt, ...) /* Calculate the tag based on the connection ID and command ID */ snprintf(imapc->resptag, sizeof(imapc->resptag), "%c%03d", - 'A' + (conn->connection_id % 26), imapc->cmdid); + 'A' + curlx_sltosi(conn->connection_id % 26), imapc->cmdid); /* Prefix the format with the tag */ taggedfmt = aprintf("%s %s", imapc->resptag, fmt); diff --git a/lib/memdebug.c b/lib/memdebug.c index 4e4f84cb2..f9afae3a7 100644 --- a/lib/memdebug.c +++ b/lib/memdebug.c @@ -186,7 +186,9 @@ void *curl_domalloc(size_t wantedsize, int line, const char *source) if(source) curl_memlog("MEM %s:%d malloc(%zd) = %p\n", - source, line, wantedsize, mem ? mem->mem : 0); + source, line, wantedsize, + mem ? (void *)mem->mem : (void *)0); + return (mem ? mem->mem : NULL); } @@ -212,7 +214,9 @@ void *curl_docalloc(size_t wanted_elements, size_t wanted_size, if(source) curl_memlog("MEM %s:%d calloc(%zu,%zu) = %p\n", - source, line, wanted_elements, wanted_size, mem?mem->mem:0); + source, line, wanted_elements, wanted_size, + mem ? (void *)mem->mem : (void *)0); + return (mem ? mem->mem : NULL); } @@ -234,7 +238,7 @@ char *curl_dostrdup(const char *str, int line, const char *source) if(source) curl_memlog("MEM %s:%d strdup(%p) (%zu) = %p\n", - source, line, str, len, mem); + source, line, (void *)str, len, (void *)mem); return mem; } @@ -259,7 +263,7 @@ wchar_t *curl_dowcsdup(const wchar_t *str, int line, const char *source) if(source) curl_memlog("MEM %s:%d wcsdup(%p) (%zu) = %p\n", - source, line, str, bsiz, mem); + source, line, (void *)str, bsiz, (void *)mem); return mem; } @@ -295,7 +299,8 @@ void *curl_dorealloc(void *ptr, size_t wantedsize, mem = (Curl_crealloc)(mem, size); if(source) curl_memlog("MEM %s:%d realloc(%p, %zu) = %p\n", - source, line, ptr, wantedsize, mem?mem->mem:NULL); + source, line, (void *)ptr, wantedsize, + mem ? (void *)mem->mem : (void *)0); if(mem) { mem->size = wantedsize; @@ -330,7 +335,7 @@ void curl_dofree(void *ptr, int line, const char *source) (Curl_cfree)(mem); if(source) - curl_memlog("MEM %s:%d free(%p)\n", source, line, ptr); + curl_memlog("MEM %s:%d free(%p)\n", source, line, (void *)ptr); } curl_socket_t curl_socket(int domain, int type, int protocol, @@ -343,8 +348,10 @@ curl_socket_t curl_socket(int domain, int type, int protocol, "FD %s:%d socket() = %zd\n" ; curl_socket_t sockfd = socket(domain, type, protocol); + if(source && (sockfd != CURL_SOCKET_BAD)) curl_memlog(fmt, source, line, sockfd); + return sockfd; } @@ -360,8 +367,10 @@ int curl_socketpair(int domain, int type, int protocol, "FD %s:%d socketpair() = %zd %zd\n" ; int res = socketpair(domain, type, protocol, socket_vector); + if(source && (0 == res)) curl_memlog(fmt, source, line, socket_vector[0], socket_vector[1]); + return res; } #endif @@ -377,9 +386,12 @@ curl_socket_t curl_accept(curl_socket_t s, void *saddr, void *saddrlen, struct sockaddr *addr = (struct sockaddr *)saddr; curl_socklen_t *addrlen = (curl_socklen_t *)saddrlen; + curl_socket_t sockfd = accept(s, addr, addrlen); + if(source && (sockfd != CURL_SOCKET_BAD)) curl_memlog(fmt, source, line, sockfd); + return sockfd; } @@ -408,9 +420,11 @@ FILE *curl_fopen(const char *file, const char *mode, int line, const char *source) { FILE *res=fopen(file, mode); + if(source) curl_memlog("FILE %s:%d fopen(\"%s\",\"%s\") = %p\n", - source, line, file, mode, res); + source, line, file, mode, (void *)res); + return res; } @@ -419,9 +433,11 @@ FILE *curl_fdopen(int filedes, const char *mode, int line, const char *source) { FILE *res=fdopen(filedes, mode); + if(source) curl_memlog("FILE %s:%d fdopen(\"%d\",\"%s\") = %p\n", - source, line, filedes, mode, res); + source, line, filedes, mode, (void *)res); + return res; } #endif @@ -433,9 +449,11 @@ int curl_fclose(FILE *file, int line, const char *source) assert(file != NULL); res=fclose(file); + if(source) curl_memlog("FILE %s:%d fclose(%p)\n", - source, line, file); + source, line, (void *)file); + return res; } diff --git a/lib/multi.c b/lib/multi.c index e173fd64f..cd1562020 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -131,7 +131,7 @@ static void mstate(struct Curl_one_easy *easy, CURLMstate state infof(easy->easy_handle, "STATE: %s => %s handle %p; line %d (connection #%ld) \n", statename[oldstate], statename[easy->state], - (char *)easy, lineno, connection_id); + (void *)easy, lineno, connection_id); } #endif if(state == CURLM_STATE_COMPLETED) @@ -966,7 +966,7 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi, we're using gets cleaned up and we're left with nothing. */ if(data->state.pipe_broke) { infof(data, "Pipe broke: handle 0x%p, url = %s\n", - easy, data->state.path); + (void *)easy, data->state.path); if(easy->state < CURLM_STATE_COMPLETED) { /* Head back to the CONNECT state */ diff --git a/lib/pipeline.c b/lib/pipeline.c index 624fc4257..73ac9c5a3 100644 --- a/lib/pipeline.c +++ b/lib/pipeline.c @@ -6,6 +6,7 @@ * \___|\___/|_| \_\_____| * * Copyright (C) 2013, Linus Nielsen Feltzing, + * Copyright (C) 2013, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -84,9 +85,10 @@ bool Curl_pipeline_penalized(struct SessionHandle *data, (curl_off_t)conn->chunk.datasize > chunk_penalty_size) penalized = TRUE; - infof(data, "Conn: %d (%p) Receive pipe weight: (%d/%d), penalized: %d\n", - conn->connection_id, conn, recv_size, - conn->chunk.datasize, penalized); + infof(data, "Conn: %ld (%p) Receive pipe weight: (%" FORMAT_OFF_T + "/%zd), penalized: %s\n", + conn->connection_id, (void *)conn, recv_size, + conn->chunk.datasize, penalized?"TRUE":"FALSE"); return penalized; } return FALSE; @@ -101,7 +103,7 @@ CURLcode Curl_add_handle_to_pipeline(struct SessionHandle *handle, pipeline = conn->send_pipe; - infof(conn->data, "Adding handle: conn: %p\n", conn); + infof(conn->data, "Adding handle: conn: %p\n", (void *)conn); infof(conn->data, "Adding handle: send: %d\n", conn->send_pipe->size); infof(conn->data, "Adding handle: recv: %d\n", conn->recv_pipe->size); rc = Curl_addHandleToPipeline(handle, pipeline); @@ -111,7 +113,7 @@ CURLcode Curl_add_handle_to_pipeline(struct SessionHandle *handle, conn->writechannel_inuse = FALSE; /* not in use yet */ #ifdef DEBUGBUILD infof(conn->data, "%p is at send pipe head!\n", - conn->send_pipe->head->ptr); + (void *)conn->send_pipe->head->ptr); #endif Curl_expire(conn->send_pipe->head->ptr, 1); } @@ -144,7 +146,7 @@ void Curl_move_handle_from_send_to_recv_pipe(struct SessionHandle *handle, conn->writechannel_inuse = FALSE; /* not used now */ #ifdef DEBUGBUILD infof(conn->data, "%p is at send pipe head B!\n", - conn->send_pipe->head->ptr); + (void *)conn->send_pipe->head->ptr); #endif Curl_expire(conn->send_pipe->head->ptr, 1); } @@ -320,9 +322,9 @@ void print_pipeline(struct connectdata *conn) curr = cb_ptr->conn_list->head; while(curr) { conn = curr->ptr; - infof(data, "- Conn %d (%p) send_pipe: %d, recv_pipe: %d\n", + infof(data, "- Conn %ld (%p) send_pipe: %zd, recv_pipe: %zd\n", conn->connection_id, - conn, + (void *)conn, conn->send_pipe->size, conn->recv_pipe->size); curr = curr->next; diff --git a/lib/pop3.c b/lib/pop3.c index 6f188b254..0099a509b 100644 --- a/lib/pop3.c +++ b/lib/pop3.c @@ -382,7 +382,7 @@ static void state(struct connectdata *conn, pop3state newstate) if(pop3c->state != newstate) infof(conn->data, "POP3 %p state change from %s to %s\n", - pop3c, names[pop3c->state], names[newstate]); + (void *)pop3c, names[pop3c->state], names[newstate]); #endif pop3c->state = newstate; diff --git a/lib/security.c b/lib/security.c index 3c46953cb..495a49693 100644 --- a/lib/security.c +++ b/lib/security.c @@ -10,7 +10,7 @@ * Copyright (c) 1998, 1999 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * - * Copyright (C) 2001 - 2011, Daniel Stenberg, , et al. + * Copyright (C) 2001 - 2013, Daniel Stenberg, , et al. * * All rights reserved. * @@ -498,7 +498,7 @@ static CURLcode choose_mech(struct connectdata *conn) /* We have no mechanism with a NULL name but keep this check */ DEBUGASSERT(mech_name != NULL); if(mech_name == NULL) { - infof(data, "Skipping mechanism with empty name (%p)\n", mech); + infof(data, "Skipping mechanism with empty name (%p)\n", (void *)mech); continue; } tmp_allocation = realloc(conn->app_data, (*mech)->size); diff --git a/lib/smtp.c b/lib/smtp.c index 065c7037f..04b33d0c4 100644 --- a/lib/smtp.c +++ b/lib/smtp.c @@ -337,7 +337,7 @@ static void state(struct connectdata *conn, smtpstate newstate) if(smtpc->state != newstate) infof(conn->data, "SMTP %p state change from %s to %s\n", - smtpc, names[smtpc->state], names[newstate]); + (void *)smtpc, names[smtpc->state], names[newstate]); #endif smtpc->state = newstate; diff --git a/lib/ssh.c b/lib/ssh.c index 9b37ad69e..422357be9 100644 --- a/lib/ssh.c +++ b/lib/ssh.c @@ -392,7 +392,7 @@ static void state(struct connectdata *conn, sshstate nowstate) #if defined(DEBUGBUILD) && !defined(CURL_DISABLE_VERBOSE_STRINGS) if(sshc->state != nowstate) { infof(conn->data, "SFTP %p state change from %s to %s\n", - sshc, names[sshc->state], names[nowstate]); + (void *)sshc, names[sshc->state], names[nowstate]); } #endif diff --git a/lib/url.c b/lib/url.c index a8f2a0985..347092d59 100644 --- a/lib/url.c +++ b/lib/url.c @@ -2574,7 +2574,7 @@ CURLcode Curl_disconnect(struct connectdata *conn, bool dead_connection) conn->handler->disconnect(conn, dead_connection); /* unlink ourselves! */ - infof(data, "Closing connection %d\n", conn->connection_id); + infof(data, "Closing connection %ld\n", conn->connection_id); Curl_conncache_remove_conn(data->state.conn_cache, conn); #if defined(USE_LIBIDN) @@ -2875,7 +2875,8 @@ ConnectionExists(struct SessionHandle *data, size_t best_pipe_len = max_pipe_len; struct curl_llist_element *curr; - infof(data, "Found bundle for host %s: %p\n", needle->host.name, bundle); + infof(data, "Found bundle for host %s: %p\n", + needle->host.name, (void *)bundle); /* We can't pipe if we don't know anything about the server */ if(canPipeline && !bundle->server_supports_pipelining) { @@ -2911,7 +2912,7 @@ ConnectionExists(struct SessionHandle *data, if(dead) { check->data = data; - infof(data, "Connection %d seems to be dead!\n", + infof(data, "Connection %ld seems to be dead!\n", check->connection_id); /* disconnect resources */ @@ -5335,7 +5336,7 @@ static CURLcode create_conn(struct SessionHandle *data, if(reuse && !force_reuse && IsPipeliningPossible(data, conn_temp)) { size_t pipelen = conn_temp->send_pipe->size + conn_temp->recv_pipe->size; if(pipelen > 0) { - infof(data, "Found connection %d, with requests in the pipe (%d)\n", + infof(data, "Found connection %ld, with requests in the pipe (%zd)\n", conn_temp->connection_id, pipelen); if(conn_temp->bundle->num_connections < max_host_connections && -- cgit v1.2.3