strictness: correct {infof, failf} format specifiers (8ea5d41f) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP curl

lib/conncache.c

+8 −11

Original line number	Diff line number	Diff line
		@@ -301,8 +301,8 @@ CURLcode Curl_conncache_add_conn(struct conncache *connc,
		connc->num_conn++;

		DEBUGF(infof(conn->data, "Added connection %ld. "
		"The cache now contains %" CURL_FORMAT_CURL_OFF_TU " members\n",
		conn->connection_id, (curl_off_t) connc->num_conn));
		"The cache now contains %zu members\n",
		conn->connection_id, connc->num_conn));

		unlock:
		CONN_UNLOCK(data);
		@@ -328,9 +328,8 @@ void Curl_conncache_remove_conn(struct connectdata *conn, bool lock)
		conn->bundle = NULL; /* removed from it */
		if(connc) {
		connc->num_conn--;
		DEBUGF(infof(conn->data, "The cache now contains %"
		CURL_FORMAT_CURL_OFF_TU " members\n",
		(curl_off_t) connc->num_conn));
		DEBUGF(infof(conn->data, "The cache now contains %zu members\n",
		connc->num_conn));
		}
		if(lock) {
		CONN_UNLOCK(conn->data);
		@@ -501,9 +500,8 @@ Curl_conncache_extract_bundle(struct Curl_easy *data,
		/* remove it to prevent another thread from nicking it */
		bundle_remove_conn(bundle, conn_candidate);
		data->state.conn_cache->num_conn--;
		DEBUGF(infof(data, "The cache now contains %"
		CURL_FORMAT_CURL_OFF_TU " members\n",
		(curl_off_t) data->state.conn_cache->num_conn));
		DEBUGF(infof(data, "The cache now contains %zu members\n",
		data->state.conn_cache->num_conn));
		}

		return conn_candidate;
		@@ -563,9 +561,8 @@ Curl_conncache_extract_oldest(struct Curl_easy *data)
		/* remove it to prevent another thread from nicking it */
		bundle_remove_conn(bundle_candidate, conn_candidate);
		connc->num_conn--;
		DEBUGF(infof(data, "The cache now contains %"
		CURL_FORMAT_CURL_OFF_TU " members\n",
		(curl_off_t) connc->num_conn));
		DEBUGF(infof(data, "The cache now contains %zu members\n",
		connc->num_conn));
		}
		CONN_UNLOCK(data);

lib/cookie.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -496,7 +496,7 @@ Curl_cookie_add(struct Curl_easy *data,
		name + contents. Chrome and Firefox support 4095 or 4096 bytes
		combo. */
		freecookie(co);
		infof(data, "oversized cookie dropped, name/val %d + %d bytes\n",
		infof(data, "oversized cookie dropped, name/val %zu + %zu bytes\n",
		nlen, len);
		return NULL;
		}

lib/http.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2992,7 +2992,7 @@ static CURLcode header_append(struct Curl_easy *data,
		/* The reason to have a max limit for this is to avoid the risk of a bad
		server feeding libcurl with a never-ending header that will cause
		reallocs infinitely */
		failf(data, "Rejected %zd bytes header (max is %d)!", newsize,
		failf(data, "Rejected %zu bytes header (max is %d)!", newsize,
		CURL_MAX_HTTP_HEADER);
		return CURLE_OUT_OF_MEMORY;
		}

lib/http2.c

+7 −7

Original line number	Diff line number	Diff line
		@@ -581,7 +581,7 @@ static int on_frame_recv(nghttp2_session session, const nghttp2_frame frame,
		if(max_conn != httpc->settings.max_concurrent_streams) {
		/* only signal change if the value actually changed */
		infof(conn->data,
		"Connection state changed (MAX_CONCURRENT_STREAMS == %d)!\n",
		"Connection state changed (MAX_CONCURRENT_STREAMS == %u)!\n",
		httpc->settings.max_concurrent_streams);
		Curl_multi_connchanged(conn->data->multi);
		}
		@@ -1280,7 +1280,7 @@ static int h2_process_pending_input(struct connectdata *conn,
		if(rv < 0) {
		failf(data,
		"h2_process_pending_input: nghttp2_session_mem_recv() returned "
		"%d:%s\n", rv, nghttp2_strerror((int)rv));
		"%zd:%s\n", rv, nghttp2_strerror((int)rv));
		*err = CURLE_RECV_ERROR;
		return -1;
		}
		@@ -1388,7 +1388,7 @@ static ssize_t http2_handle_stream_close(struct connectdata *conn,
		return -1;
		}
		else if(httpc->error_code != NGHTTP2_NO_ERROR) {
		failf(data, "HTTP/2 stream %u was not closed cleanly: %s (err %d)",
		failf(data, "HTTP/2 stream %d was not closed cleanly: %s (err %u)",
		stream->stream_id, Curl_http2_strerror(httpc->error_code),
		httpc->error_code);
		*err = CURLE_HTTP2_STREAM;
		@@ -1396,7 +1396,7 @@ static ssize_t http2_handle_stream_close(struct connectdata *conn,
		}

		if(!stream->bodystarted) {
		failf(data, "HTTP/2 stream %u was closed cleanly, but before getting "
		failf(data, "HTTP/2 stream %d was closed cleanly, but before getting "
		" all response header fields, treated as error",
		stream->stream_id);
		*err = CURLE_HTTP2_STREAM;
		@@ -1552,7 +1552,7 @@ static ssize_t http2_recv(struct connectdata *conn, int sockindex,
		stream->pausedata += nread;
		stream->pauselen -= nread;

		infof(data, "%zu data bytes written\n", nread);
		infof(data, "%zd data bytes written\n", nread);
		if(stream->pauselen == 0) {
		H2BUGF(infof(data, "Unpaused by stream %u\n", stream->stream_id));
		DEBUGASSERT(httpc->pause_stream_id == stream->stream_id);
		@@ -1635,7 +1635,7 @@ static ssize_t http2_recv(struct connectdata *conn, int sockindex,
		rv = nghttp2_session_mem_recv(httpc->h2, (const uint8_t *)inbuf, nread);

		if(nghttp2_is_fatal((int)rv)) {
		failf(data, "nghttp2_session_mem_recv() returned %d:%s\n",
		failf(data, "nghttp2_session_mem_recv() returned %zd:%s\n",
		rv, nghttp2_strerror((int)rv));
		*err = CURLE_RECV_ERROR;
		return -1;
		@@ -2040,7 +2040,7 @@ static ssize_t http2_send(struct connectdata *conn, int sockindex,
		}

		infof(conn->data, "Using Stream ID: %x (easy handle %p)\n",
		stream_id, conn->data);
		stream_id, (void *)conn->data);
		stream->stream_id = stream_id;

		/* this does not call h2_session_send() since there can not have been any

lib/http_proxy.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -206,7 +206,7 @@ static CURLcode CONNECT(struct connectdata *conn,
		char *host_port;
		Curl_send_buffer *req_buffer;

		infof(data, "Establish HTTP proxy tunnel to %s:%hu\n",
		infof(data, "Establish HTTP proxy tunnel to %s:%d\n",
		hostname, remote_port);

		/* This only happens if we've looped here due to authentication