← Commit list

4ff04615a0

Daniel Stenberg

2024-09-03

SUCCESS Duration: 77s

Subject

lib: use FMT_ as prefix instead of CURL_FORMAT_

Binary

Download Binary (853 KB)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

$ git checkout -f 4ff04615a095ed1e7c489e3bbd4600b52e68d9a7
Previous HEAD position was 933e202eb5 KNOWN_BUGS: CURLOPT_CONNECT_TO does not work for HTTPS proxy
HEAD is now at 4ff04615a0 lib: use FMT_ as prefix instead of CURL_FORMAT_

$ git clean -fdx
Removing Makefile
Removing Makefile.in
Removing aclocal.m4
Removing autom4te.cache/
Removing compile
Removing config.guess
Removing config.log
Removing config.status
Removing config.sub
Removing configure
Removing curl-config
Removing depcomp
Removing docs/Makefile
Removing docs/Makefile.in
Removing docs/cmdline-opts/Makefile
Removing docs/cmdline-opts/Makefile.in
Removing docs/examples/.deps/
Removing docs/examples/Makefile
Removing docs/examples/Makefile.in
Removing docs/libcurl/Makefile
Removing docs/libcurl/Makefile.in
Removing docs/libcurl/opts/Makefile
Removing docs/libcurl/opts/Makefile.in
Removing include/Makefile
Removing include/Makefile.in
Removing include/curl/Makefile
Removing include/curl/Makefile.in
Removing install-sh
Removing lib/.deps/
Removing lib/.dirstamp
Removing lib/.libs/
Removing lib/Makefile
Removing lib/Makefile.in
Removing lib/base64.o
Removing lib/curl_config.h
Removing lib/curl_config.h.in
Removing lib/curl_multibyte.o
Removing lib/dynbuf.o
Removing lib/libcurl.la
Removing lib/libcurl.vers
Removing lib/libcurl_la-altsvc.lo
Removing lib/libcurl_la-altsvc.o
Removing lib/libcurl_la-amigaos.lo
Removing lib/libcurl_la-amigaos.o
Removing lib/libcurl_la-asyn-ares.lo
Removing lib/libcurl_la-asyn-ares.o
Removing lib/libcurl_la-asyn-thread.lo
Removing lib/libcurl_la-asyn-thread.o
Removing lib/libcurl_la-base64.lo
Removing lib/libcurl_la-base64.o
Removing lib/libcurl_la-bufq.lo
Removing lib/libcurl_la-bufq.o
Removing lib/libcurl_la-bufref.lo
Removing lib/libcurl_la-bufref.o
Removing lib/libcurl_la-c-hyper.lo
Removing lib/libcurl_la-c-hyper.o
Removing lib/libcurl_la-cf-h1-proxy.lo
Removing lib/libcurl_la-cf-h1-proxy.o
Removing lib/libcurl_la-cf-h2-proxy.lo
Removing lib/libcurl_la-cf-h2-proxy.o
Removing lib/libcurl_la-cf-haproxy.lo
Removing lib/libcurl_la-cf-haproxy.o
Removing lib/libcurl_la-cf-https-connect.lo
Removing lib/libcurl_la-cf-https-connect.o
Removing lib/libcurl_la-cf-socket.lo
Removing lib/libcurl_la-cf-socket.o
Removing lib/libcurl_la-cfilters.lo
Removing lib/libcurl_la-cfilters.o
Removing lib/libcurl_la-conncache.lo
Removing lib/libcurl_la-conncache.o
Removing lib/libcurl_la-connect.lo
Removing lib/libcurl_la-connect.o
Removing lib/libcurl_la-content_encoding.lo
Removing lib/libcurl_la-content_encoding.o
Removing lib/libcurl_la-cookie.lo
Removing lib/libcurl_la-cookie.o
Removing lib/libcurl_la-curl_addrinfo.lo
Removing lib/libcurl_la-curl_addrinfo.o
Removing lib/libcurl_la-curl_des.lo
Removing lib/libcurl_la-curl_des.o
Removing lib/libcurl_la-curl_endian.lo
Removing lib/libcurl_la-curl_endian.o
Removing lib/libcurl_la-curl_fnmatch.lo
Removing lib/libcurl_la-curl_fnmatch.o
Removing lib/libcurl_la-curl_get_line.lo
Removing lib/libcurl_la-curl_get_line.o
Removing lib/libcurl_la-curl_gethostname.lo
Removing lib/libcurl_la-curl_gethostname.o
Removing lib/libcurl_la-curl_gssapi.lo
Removing lib/libcurl_la-curl_gssapi.o
Removing lib/libcurl_la-curl_memrchr.lo
Removing lib/libcurl_la-curl_memrchr.o
Removing lib/libcurl_la-curl_multibyte.lo
Removing lib/libcurl_la-curl_multibyte.o
Removing lib/libcurl_la-curl_ntlm_core.lo
Removing lib/libcurl_la-curl_ntlm_core.o
Removing lib/libcurl_la-curl_path.lo
Removing lib/libcurl_la-curl_path.o
Removing lib/libcurl_la-curl_range.lo
Removing lib/libcurl_la-curl_range.o
Removing lib/libcurl_la-curl_rtmp.lo
Removing lib/libcurl_la-curl_rtmp.o
Removing lib/libcurl_la-curl_sasl.lo
Removing lib/libcurl_la-curl_sasl.o
Removing lib/libcurl_la-curl_sha512_256.lo
Removing lib/libcurl_la-curl_sha512_256.o
Removing lib/libcurl_la-curl_sspi.lo
Removing lib/libcurl_la-curl_sspi.o
Removing lib/libcurl_la-curl_threads.lo
Removing lib/libcurl_la-curl_threads.o
Removing lib/libcurl_la-curl_trc.lo
Removing lib/libcurl_la-curl_trc.o
Removing lib/libcurl_la-cw-out.lo
Removing lib/libcurl_la-cw-out.o
Removing lib/libcurl_la-dict.lo
Removing lib/libcurl_la-dict.o
Removing lib/libcurl_la-dllmain.lo
Removing lib/libcurl_la-dllmain.o
Removing lib/libcurl_la-doh.lo
Removing lib/libcurl_la-doh.o
Removing lib/libcurl_la-dynbuf.lo
Removing lib/libcurl_la-dynbuf.o
Removing lib/libcurl_la-dynhds.lo
Removing lib/libcurl_la-dynhds.o
Removing lib/libcurl_la-easy.lo
Removing lib/libcurl_la-easy.o
Removing lib/libcurl_la-easygetopt.lo
Removing lib/libcurl_la-easygetopt.o
Removing lib/libcurl_la-easyoptions.lo
Removing lib/libcurl_la-easyoptions.o
Removing lib/libcurl_la-escape.lo
Removing lib/libcurl_la-escape.o
Removing lib/libcurl_la-file.lo
Removing lib/libcurl_la-file.o
Removing lib/libcurl_la-fileinfo.lo
Removing lib/libcurl_la-fileinfo.o
Removing lib/libcurl_la-fopen.lo
Removing lib/libcurl_la-fopen.o
Removing lib/libcurl_la-formdata.lo
Removing lib/libcurl_la-formdata.o
Removing lib/libcurl_la-ftp.lo
Removing lib/libcurl_la-ftp.o
Removing lib/libcurl_la-ftplistparser.lo
Removing lib/libcurl_la-ftplistparser.o
Removing lib/libcurl_la-getenv.lo
Removing lib/libcurl_la-getenv.o
Removing lib/libcurl_la-getinfo.lo
Removing lib/libcurl_la-getinfo.o
Removing lib/libcurl_la-gopher.lo
Removing lib/libcurl_la-gopher.o
Removing lib/libcurl_la-hash.lo
Removing lib/libcurl_la-hash.o
Removing lib/libcurl_la-headers.lo
Removing lib/libcurl_la-headers.o
Removing lib/libcurl_la-hmac.lo
Removing lib/libcurl_la-hmac.o
Removing lib/libcurl_la-hostasyn.lo
Removing lib/libcurl_la-hostasyn.o
Removing lib/libcurl_la-hostip.lo
Removing lib/libcurl_la-hostip.o
Removing lib/libcurl_la-hostip4.lo
Removing lib/libcurl_la-hostip4.o
Removing lib/libcurl_la-hostip6.lo
Removing lib/libcurl_la-hostip6.o
Removing lib/libcurl_la-hostsyn.lo
Removing lib/libcurl_la-hostsyn.o
Removing lib/libcurl_la-hsts.lo
Removing lib/libcurl_la-hsts.o
Removing lib/libcurl_la-http.lo
Removing lib/libcurl_la-http.o
Removing lib/libcurl_la-http1.lo
Removing lib/libcurl_la-http1.o
Removing lib/libcurl_la-http2.lo
Removing lib/libcurl_la-http2.o
Removing lib/libcurl_la-http_aws_sigv4.lo
Removing lib/libcurl_la-http_aws_sigv4.o
Removing lib/libcurl_la-http_chunks.lo
Removing lib/libcurl_la-http_chunks.o
Removing lib/libcurl_la-http_digest.lo
Removing lib/libcurl_la-http_digest.o
Removing lib/libcurl_la-http_negotiate.lo
Removing lib/libcurl_la-http_negotiate.o
Removing lib/libcurl_la-http_ntlm.lo
Removing lib/libcurl_la-http_ntlm.o
Removing lib/libcurl_la-http_proxy.lo
Removing lib/libcurl_la-http_proxy.o
Removing lib/libcurl_la-idn.lo
Removing lib/libcurl_la-idn.o
Removing lib/libcurl_la-if2ip.lo
Removing lib/libcurl_la-if2ip.o
Removing lib/libcurl_la-imap.lo
Removing lib/libcurl_la-imap.o
Removing lib/libcurl_la-inet_ntop.lo
Removing lib/libcurl_la-inet_ntop.o
Removing lib/libcurl_la-inet_pton.lo
Removing lib/libcurl_la-inet_pton.o
Removing lib/libcurl_la-krb5.lo
Removing lib/libcurl_la-krb5.o
Removing lib/libcurl_la-ldap.lo
Removing lib/libcurl_la-ldap.o
Removing lib/libcurl_la-llist.lo
Removing lib/libcurl_la-llist.o
Removing lib/libcurl_la-macos.lo
Removing lib/libcurl_la-macos.o
Removing lib/libcurl_la-md4.lo
Removing lib/libcurl_la-md4.o
Removing lib/libcurl_la-md5.lo
Removing lib/libcurl_la-md5.o
Removing lib/libcurl_la-memdebug.lo
Removing lib/libcurl_la-memdebug.o
Removing lib/libcurl_la-mime.lo
Removing lib/libcurl_la-mime.o
Removing lib/libcurl_la-mprintf.lo
Removing lib/libcurl_la-mprintf.o
Removing lib/libcurl_la-mqtt.lo
Removing lib/libcurl_la-mqtt.o
Removing lib/libcurl_la-multi.lo
Removing lib/libcurl_la-multi.o
Removing lib/libcurl_la-netrc.lo
Removing lib/libcurl_la-netrc.o
Removing lib/libcurl_la-nonblock.lo
Removing lib/libcurl_la-nonblock.o
Removing lib/libcurl_la-noproxy.lo
Removing lib/libcurl_la-noproxy.o
Removing lib/libcurl_la-openldap.lo
Removing lib/libcurl_la-openldap.o
Removing lib/libcurl_la-parsedate.lo
Removing lib/libcurl_la-parsedate.o
Removing lib/libcurl_la-pingpong.lo
Removing lib/libcurl_la-pingpong.o
Removing lib/libcurl_la-pop3.lo
Removing lib/libcurl_la-pop3.o
Removing lib/libcurl_la-progress.lo
Removing lib/libcurl_la-progress.o
Removing lib/libcurl_la-psl.lo
Removing lib/libcurl_la-psl.o
Removing lib/libcurl_la-rand.lo
Removing lib/libcurl_la-rand.o
Removing lib/libcurl_la-rename.lo
Removing lib/libcurl_la-rename.o
Removing lib/libcurl_la-request.lo
Removing lib/libcurl_la-request.o
Removing lib/libcurl_la-rtsp.lo
Removing lib/libcurl_la-rtsp.o
Removing lib/libcurl_la-select.lo
Removing lib/libcurl_la-select.o
Removing lib/libcurl_la-sendf.lo
Removing lib/libcurl_la-sendf.o
Removing lib/libcurl_la-setopt.lo
Removing lib/libcurl_la-setopt.o
Removing lib/libcurl_la-sha256.lo
Removing lib/libcurl_la-sha256.o
Removing lib/libcurl_la-share.lo
Removing lib/libcurl_la-share.o
Removing lib/libcurl_la-slist.lo
Removing lib/libcurl_la-slist.o
Removing lib/libcurl_la-smb.lo
Removing lib/libcurl_la-smb.o
Removing lib/libcurl_la-smtp.lo
Removing lib/libcurl_la-smtp.o
Removing lib/libcurl_la-socketpair.lo
Removing lib/libcurl_la-socketpair.o
Removing lib/libcurl_la-socks.lo
Removing lib/libcurl_la-socks.o
Removing lib/libcurl_la-socks_gssapi.lo
Removing lib/libcurl_la-socks_gssapi.o
Removing lib/libcurl_la-socks_sspi.lo
Removing lib/libcurl_la-socks_sspi.o
Removing lib/libcurl_la-speedcheck.lo
Removing lib/libcurl_la-speedcheck.o
Removing lib/libcurl_la-splay.lo
Removing lib/libcurl_la-splay.o
Removing lib/libcurl_la-strcase.lo
Removing lib/libcurl_la-strcase.o
Removing lib/libcurl_la-strdup.lo
Removing lib/libcurl_la-strdup.o
Removing lib/libcurl_la-strerror.lo
Removing lib/libcurl_la-strerror.o
Removing lib/libcurl_la-strtok.lo
Removing lib/libcurl_la-strtok.o
Removing lib/libcurl_la-strtoofft.lo
Removing lib/libcurl_la-strtoofft.o
Removing lib/libcurl_la-system_win32.lo
Removing lib/libcurl_la-system_win32.o
Removing lib/libcurl_la-telnet.lo
Removing lib/libcurl_la-telnet.o
Removing lib/libcurl_la-tftp.lo
Removing lib/libcurl_la-tftp.o
Removing lib/libcurl_la-timediff.lo
Removing lib/libcurl_la-timediff.o
Removing lib/libcurl_la-timeval.lo
Removing lib/libcurl_la-timeval.o
Removing lib/libcurl_la-transfer.lo
Removing lib/libcurl_la-transfer.o
Removing lib/libcurl_la-url.lo
Removing lib/libcurl_la-url.o
Removing lib/libcurl_la-urlapi.lo
Removing lib/libcurl_la-urlapi.o
Removing lib/libcurl_la-version.lo
Removing lib/libcurl_la-version.o
Removing lib/libcurl_la-version_win32.lo
Removing lib/libcurl_la-version_win32.o
Removing lib/libcurl_la-warnless.lo
Removing lib/libcurl_la-warnless.o
Removing lib/libcurl_la-ws.lo
Removing lib/libcurl_la-ws.o
Removing lib/nonblock.o
Removing lib/stamp-h1
Removing lib/strtoofft.o
Removing lib/timediff.o
Removing lib/vauth/.deps/
Removing lib/vauth/.dirstamp
Removing lib/vauth/libcurl_la-cleartext.lo
Removing lib/vauth/libcurl_la-cleartext.o
Removing lib/vauth/libcurl_la-cram.lo
Removing lib/vauth/libcurl_la-cram.o
Removing lib/vauth/libcurl_la-digest.lo
Removing lib/vauth/libcurl_la-digest.o
Removing lib/vauth/libcurl_la-digest_sspi.lo
Removing lib/vauth/libcurl_la-digest_sspi.o
Removing lib/vauth/libcurl_la-gsasl.lo
Removing lib/vauth/libcurl_la-gsasl.o
Removing lib/vauth/libcurl_la-krb5_gssapi.lo
Removing lib/vauth/libcurl_la-krb5_gssapi.o
Removing lib/vauth/libcurl_la-krb5_sspi.lo
Removing lib/vauth/libcurl_la-krb5_sspi.o
Removing lib/vauth/libcurl_la-ntlm.lo
Removing lib/vauth/libcurl_la-ntlm.o
Removing lib/vauth/libcurl_la-ntlm_sspi.lo
Removing lib/vauth/libcurl_la-ntlm_sspi.o
Removing lib/vauth/libcurl_la-oauth2.lo
Removing lib/vauth/libcurl_la-oauth2.o
Removing lib/vauth/libcurl_la-spnego_gssapi.lo
Removing lib/vauth/libcurl_la-spnego_gssapi.o
Removing lib/vauth/libcurl_la-spnego_sspi.lo
Removing lib/vauth/libcurl_la-spnego_sspi.o
Removing lib/vauth/libcurl_la-vauth.lo
Removing lib/vauth/libcurl_la-vauth.o
Removing lib/version_win32.o
Removing lib/vquic/.deps/
Removing lib/vquic/.dirstamp
Removing lib/vquic/libcurl_la-curl_msh3.lo
Removing lib/vquic/libcurl_la-curl_msh3.o
Removing lib/vquic/libcurl_la-curl_ngtcp2.lo
Removing lib/vquic/libcurl_la-curl_ngtcp2.o
Removing lib/vquic/libcurl_la-curl_osslq.lo
Removing lib/vquic/libcurl_la-curl_osslq.o
Removing lib/vquic/libcurl_la-curl_quiche.lo
Removing lib/vquic/libcurl_la-curl_quiche.o
Removing lib/vquic/libcurl_la-vquic-tls.lo
Removing lib/vquic/libcurl_la-vquic-tls.o
Removing lib/vquic/libcurl_la-vquic.lo
Removing lib/vquic/libcurl_la-vquic.o
Removing lib/vssh/.deps/
Removing lib/vssh/.dirstamp
Removing lib/vssh/libcurl_la-libssh.lo
Removing lib/vssh/libcurl_la-libssh.o
Removing lib/vssh/libcurl_la-libssh2.lo
Removing lib/vssh/libcurl_la-libssh2.o
Removing lib/vssh/libcurl_la-wolfssh.lo
Removing lib/vssh/libcurl_la-wolfssh.o
Removing lib/vtls/.deps/
Removing lib/vtls/.dirstamp
Removing lib/vtls/libcurl_la-bearssl.lo
Removing lib/vtls/libcurl_la-bearssl.o
Removing lib/vtls/libcurl_la-cipher_suite.lo
Removing lib/vtls/libcurl_la-cipher_suite.o
Removing lib/vtls/libcurl_la-gtls.lo
Removing lib/vtls/libcurl_la-gtls.o
Removing lib/vtls/libcurl_la-hostcheck.lo
Removing lib/vtls/libcurl_la-hostcheck.o
Removing lib/vtls/libcurl_la-keylog.lo
Removing lib/vtls/libcurl_la-keylog.o
Removing lib/vtls/libcurl_la-mbedtls.lo
Removing lib/vtls/libcurl_la-mbedtls.o
Removing lib/vtls/libcurl_la-mbedtls_threadlock.lo
Removing lib/vtls/libcurl_la-mbedtls_threadlock.o
Removing lib/vtls/libcurl_la-openssl.lo
Removing lib/vtls/libcurl_la-openssl.o
Removing lib/vtls/libcurl_la-rustls.lo
Removing lib/vtls/libcurl_la-rustls.o
Removing lib/vtls/libcurl_la-schannel.lo
Removing lib/vtls/libcurl_la-schannel.o
Removing lib/vtls/libcurl_la-schannel_verify.lo
Removing lib/vtls/libcurl_la-schannel_verify.o
Removing lib/vtls/libcurl_la-sectransp.lo
Removing lib/vtls/libcurl_la-sectransp.o
Removing lib/vtls/libcurl_la-vtls.lo
Removing lib/vtls/libcurl_la-vtls.o
Removing lib/vtls/libcurl_la-wolfssl.lo
Removing lib/vtls/libcurl_la-wolfssl.o
Removing lib/vtls/libcurl_la-x509asn1.lo
Removing lib/vtls/libcurl_la-x509asn1.o
Removing lib/warnless.o
Removing libcurl.pc
Removing libtool
Removing ltmain.sh
Removing m4/libtool.m4
Removing m4/ltoptions.m4
Removing m4/ltsugar.m4
Removing m4/ltversion.m4
Removing m4/lt~obsolete.m4
Removing missing
Removing packages/Makefile
Removing packages/Makefile.in
Removing packages/vms/Makefile
Removing packages/vms/Makefile.in
Removing scripts/Makefile
Removing scripts/Makefile.in
Removing src/.deps/
Removing src/.libs/
Removing src/Makefile
Removing src/Makefile.in
Removing src/curl
Removing src/slist_wc.o
Removing src/terminal.o
Removing src/tool_binmode.o
Removing src/tool_bname.o
Removing src/tool_ca_embed.c
Removing src/tool_ca_embed.o
Removing src/tool_cb_dbg.o
Removing src/tool_cb_hdr.o
Removing src/tool_cb_prg.o
Removing src/tool_cb_rea.o
Removing src/tool_cb_see.o
Removing src/tool_cb_soc.o
Removing src/tool_cb_wrt.o
Removing src/tool_cfgable.o
Removing src/tool_dirhie.o
Removing src/tool_doswin.o
Removing src/tool_easysrc.o
Removing src/tool_filetime.o
Removing src/tool_findfile.o
Removing src/tool_formparse.o
Removing src/tool_getparam.o
Removing src/tool_getpass.o
Removing src/tool_help.o
Removing src/tool_helpers.o
Removing src/tool_hugehelp.c
Removing src/tool_hugehelp.o
Removing src/tool_ipfs.o
Removing src/tool_libinfo.o
Removing src/tool_listhelp.o
Removing src/tool_main.o
Removing src/tool_msgs.o
Removing src/tool_operate.o
Removing src/tool_operhlp.o
Removing src/tool_paramhlp.o
Removing src/tool_parsecfg.o
Removing src/tool_progress.o
Removing src/tool_setopt.o
Removing src/tool_sleep.o
Removing src/tool_stderr.o
Removing src/tool_strdup.o
Removing src/tool_urlglob.o
Removing src/tool_util.o
Removing src/tool_vms.o
Removing src/tool_writeout.o
Removing src/tool_writeout_json.o
Removing src/tool_xattr.o
Removing src/var.o
Removing tests/Makefile
Removing tests/Makefile.in
Removing tests/certs/Makefile
Removing tests/certs/Makefile.in
Removing tests/certs/scripts/Makefile
Removing tests/certs/scripts/Makefile.in
Removing tests/config
Removing tests/configurehelp.pm
Removing tests/data/Makefile
Removing tests/data/Makefile.in
Removing tests/http/Makefile
Removing tests/http/Makefile.in
Removing tests/http/clients/.deps/
Removing tests/http/clients/Makefile
Removing tests/http/clients/Makefile.in
Removing tests/http/config.ini
Removing tests/libtest/.deps/
Removing tests/libtest/Makefile
Removing tests/libtest/Makefile.in
Removing tests/server/.deps/
Removing tests/server/Makefile
Removing tests/server/Makefile.in
Removing tests/unit/.deps/
Removing tests/unit/Makefile
Removing tests/unit/Makefile.in

$ autoreconf -fi
libtoolize: putting auxiliary files in '.'.
libtoolize: copying file './ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, 'm4'.
libtoolize: copying file 'm4/libtool.m4'
libtoolize: copying file 'm4/ltoptions.m4'
libtoolize: copying file 'm4/ltsugar.m4'
libtoolize: copying file 'm4/ltversion.m4'
libtoolize: copying file 'm4/lt~obsolete.m4'
libtoolize: Remember to add 'LT_INIT' to configure.ac.
configure.ac:125: installing './compile'
configure.ac:437: installing './config.guess'
configure.ac:437: installing './config.sub'
configure.ac:125: installing './install-sh'
configure.ac:131: installing './missing'
docs/examples/Makefile.am: installing './depcomp'

$ bash -c find . -name config.guess -exec cp /usr/share/misc/config.guess {} \;

$ bash -c find . -name config.sub -exec cp /usr/share/misc/config.sub {} \;

$ chmod +x configure

$ ./configure --disable-shared --without-ssl --disable-docs
checking whether to enable maintainer-specific portions of Makefiles... no
checking whether make supports nested variables... yes
checking whether to enable debug build options... no
checking whether to enable compiler optimizer... (assumed) yes
checking whether to enable strict compiler warnings... no
checking whether to enable compiler warnings as errors... no
checking whether to enable curl debug memory tracking... no
checking whether to enable hiding of library internal symbols... yes
checking whether to enable c-ares for DNS lookups... no
checking whether to disable dependency on -lrt... (assumed no)
checking whether to enable HTTPSRR support... no
checking whether to enable ECH support... no
checking for path separator... :
checking for sed... /usr/bin/sed
checking for grep... /usr/bin/grep
checking that grep -E works... yes
checking for ar... /usr/bin/ar
checking for a BSD-compatible install... /usr/bin/install -c
checking for gcc... ccache gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether the compiler supports GNU C... yes
checking whether ccache gcc accepts -g... yes
checking for ccache gcc option to enable C11 features... none needed
checking whether ccache gcc understands -c and -o together... yes
checking how to run the C preprocessor... ccache gcc -E
checking for stdio.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for strings.h... yes
checking for sys/stat.h... yes
checking for sys/types.h... yes
checking for unistd.h... yes
checking for stdatomic.h... yes
checking if _Atomic is available... yes
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for code coverage support... no
checking whether build environment is sane... yes
checking for a race-free mkdir -p... /usr/bin/mkdir -p
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking whether make supports the include directive... yes (GNU style)
checking dependency style of ccache gcc... gcc3
checking curl version... 8.10.0-DEV
checking for httpd... no
checking for apache2... no
checking for apachectl... no
checking for apxs... no
configure: httpd/apache2 not in PATH, http tests disabled
configure: apxs not in PATH, http tests disabled
checking for nghttpx... no
checking for caddy... /usr/bin/caddy
checking build system type... x86_64-pc-linux-gnu
checking host system type... x86_64-pc-linux-gnu
checking for grep that handles long lines and -e... (cached) /usr/bin/grep
checking for egrep... /usr/bin/grep -E
checking if OS is AIX (to define _ALL_SOURCE)... no
checking if _THREAD_SAFE is already defined... no
checking if _THREAD_SAFE is actually needed... no
checking if _THREAD_SAFE is onwards defined... no
checking if _REENTRANT is already defined... no
checking if _REENTRANT is actually needed... no
checking if _REENTRANT is onwards defined... no
checking for special C compiler options needed for large files... no
checking for _FILE_OFFSET_BITS value needed for large files... no
checking how to print strings... printf
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for fgrep... /usr/bin/grep -F
checking for ld used by ccache gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking how to convert x86_64-pc-linux-gnu file names to x86_64-pc-linux-gnu format... func_convert_file_noop
checking how to convert x86_64-pc-linux-gnu file names to toolchain format... func_convert_file_noop
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries... pass_all
checking for dlltool... no
checking how to associate runtime and link libraries... printf %s\n
checking for archiver @FILE support... @
checking for strip... strip
checking for ranlib... ranlib
checking command to parse /usr/bin/nm -B output from ccache gcc object... ok
checking for sysroot... no
checking for a working dd... /usr/bin/dd
checking how to truncate binary pipes... /usr/bin/dd bs=4096 count=1
checking for mt... mt
checking if mt is a manifest tool... no
checking for dlfcn.h... yes
checking for objdir... .libs
checking if ccache gcc supports -fno-rtti -fno-exceptions... no
checking for ccache gcc option to produce PIC... -fPIC -DPIC
checking if ccache gcc PIC flag -fPIC -DPIC works... yes
checking if ccache gcc static flag -static works... yes
checking if ccache gcc supports -c -o file.o... yes
checking if ccache gcc supports -c -o file.o... (cached) yes
checking whether the ccache gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes
checking dynamic linker characteristics... GNU/Linux ld.so
checking how to hardcode library paths into programs... immediate
checking whether stripping libraries is possible... yes
checking if libtool supports shared libraries... yes
checking whether to build shared libraries... no
checking whether to build static libraries... yes
checking whether to build shared libraries with -version-info... yes
checking whether to build shared libraries with -no-undefined... no
checking whether to build shared libraries with -mimpure-text... no
checking whether to build shared libraries with PIC... yes
checking whether to build static libraries with PIC... yes
checking whether to build shared libraries only... no
checking whether to build static libraries only... yes
checking for windres... no
checking if cpp -P is needed... yes
checking if cpp -P works... yes
checking if compiler is DEC/Compaq/HP C... no
checking if compiler is HP-UX C... no
checking if compiler is IBM C... no
checking if compiler is Intel C... no
checking if compiler is clang... no
checking if compiler is GNU C... yes
checking compiler version... gcc '1100' (raw: '11')
checking if compiler is SunPro C... no
checking if compiler is Tiny C... no
checking whether build target is a native Windows one... no
checking if compiler accepts some basic options... yes
configure: compiler options added: -Werror-implicit-function-declaration
checking if compiler optimizer assumed setting might be used... yes
checking if compiler accepts optimizer enabling options... yes
configure: compiler options added: -O2
checking if compiler accepts strict warning options... yes
configure: compiler options added: -Wno-system-headers
checking if compiler halts on compilation errors... yes
checking if compiler halts on negative sized arrays... yes
checking if compiler halts on function prototype mismatch... yes
checking if compiler supports hiding library internal symbols... yes
checking whether build target supports Win32 file API... no
checking whether build target supports Win32 crypto API... no
checking for good-to-use Darwin CFLAGS... no
checking whether to support http... yes
checking whether to support ftp... yes
checking whether to support file... yes
checking whether to support ldap... yes
checking whether to support ldaps... yes
checking whether to support rtsp... yes
checking whether to support proxies... yes
checking whether to support dict... yes
checking whether to support telnet... yes
checking whether to support tftp... yes
checking whether to support pop3... yes
checking whether to support imap... yes
checking whether to support smb... yes
checking whether to support smtp... yes
checking whether to support gopher... yes
checking whether to support mqtt... no
checking whether to provide built-in manual... yes
checking whether to build documentation... no
checking whether to enable generation of C code... yes
checking whether to use libgcc... no
checking if X/Open network library is required... no
checking for gethostbyname... yes
checking whether build target is a native Windows one... (cached) no
checking for proto/bsdsocket.h... no
checking for connect in libraries... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... yes
checking for monotonic clock_gettime... yes
checking for clock_gettime in libraries... no additional lib required
checking if monotonic clock_gettime works... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for raw monotonic clock_gettime... yes
checking for pkg-config... /usr/bin/pkg-config
checking for zlib options with pkg-config... found
checking for zlib.h... yes
configure: found both libz and libz.h header
checking for BrotliDecoderDecompress in -lbrotlidec... no
checking for brotli/decode.h... no
checking for ZSTD_createDStream in -lzstd... no
checking for zstd.h... no
checking for lber.h... no
checking for ldap.h... no
checking for ldap_ssl.h... no
checking for LDAP libraries... cannot find LDAP libraries
checking whether to enable IPv6... yes
checking if struct sockaddr_in6 has sin6_scope_id member... yes
checking if argv can be written to... yes
checking if GSS-API support is requested... no
checking whether to enable Windows native SSL/TLS... no
checking whether to enable Secure Transport... no
checking whether to enable Amiga native SSL/TLS (AmiSSL v5)... no
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libpsl options with pkg-config... found
checking for psl_builtin in -lpsl... yes
checking for libpsl.h... yes
checking for library containing gsasl_init... no
checking for RTMP_Init in -lrtmp... no
checking whether versioned symbols are wanted... no
checking whether to build with libidn2... (assumed) yes
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libidn2 options with pkg-config... no
configure: IDN_LIBS: "-lidn2"
configure: IDN_LDFLAGS: ""
configure: IDN_CPPFLAGS: ""
configure: IDN_DIR: ""
checking if idn2_lookup_ul can be linked... no
checking for idn2.h... no
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libnghttp2 options with pkg-config... no
checking for nghttp2_session_get_stream_local_window_size in -lnghttp2... no
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for sys/select.h... yes
checking for sys/socket.h... yes
checking for sys/ioctl.h... yes
checking for unistd.h... (cached) yes
checking for stdlib.h... (cached) yes
checking for arpa/inet.h... yes
checking for net/if.h... yes
checking for netinet/in.h... yes
checking for netinet/in6.h... no
checking for sys/un.h... yes
checking for linux/tcp.h... yes
checking for netinet/tcp.h... yes
checking for netinet/udp.h... yes
checking for netdb.h... yes
checking for sys/sockio.h... no
checking for sys/stat.h... (cached) yes
checking for sys/param.h... yes
checking for termios.h... yes
checking for termio.h... yes
checking for fcntl.h... yes
checking for io.h... no
checking for pwd.h... yes
checking for utime.h... yes
checking for sys/utime.h... no
checking for sys/poll.h... yes
checking for poll.h... yes
checking for socket.h... no
checking for sys/resource.h... yes
checking for libgen.h... yes
checking for locale.h... yes
checking for stdbool.h... yes
checking for sys/filio.h... no
checking for sys/wait.h... yes
checking for sys/eventfd.h... yes
checking for setjmp.h... yes
checking for an ANSI C-conforming const... yes
checking for size_t... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for struct timeval... yes
checking run-time libs availability... fine
checking size of size_t... 8
checking size of long... 8
checking size of int... 4
checking size of time_t... 8
checking size of off_t... 8
checking size of curl_off_t... 8
checking size of curl_socket_t... 4
checking for long long... yes
checking for ssize_t... yes
checking for bool... yes
checking for sa_family_t... yes
checking for suseconds_t... yes
checking if time_t is unsigned... no
checking for in_addr_t... yes
checking for struct sockaddr_storage... yes
checking for sys/select.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for select... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for recv... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for send... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for MSG_NOSIGNAL... yes
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking if alarm can be linked... yes
checking if alarm is prototyped... yes
checking if alarm is compilable... yes
checking if alarm usage allowed... yes
checking if alarm might be used... yes
checking for sys/types.h... (cached) yes
checking for strings.h... (cached) yes
checking for sys/types.h... (cached) yes
checking for libgen.h... (cached) yes
checking if basename can be linked... yes
checking if basename is prototyped... yes
checking if basename is compilable... yes
checking if basename usage allowed... yes
checking if basename might be used... yes
checking for sys/types.h... (cached) yes
checking for socket.h... (cached) no
checking if closesocket can be linked... no
checking if closesocket might be used... no
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking if CloseSocket can be linked... no
checking if CloseSocket might be used... no
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking for fcntl.h... (cached) yes
checking if fcntl can be linked... yes
checking if fcntl is prototyped... yes
checking if fcntl is compilable... yes
checking if fcntl usage allowed... yes
checking if fcntl might be used... yes
checking if fcntl O_NONBLOCK is compilable... yes
checking if fcntl O_NONBLOCK usage allowed... yes
checking if fcntl O_NONBLOCK might be used... yes
checking whether build target is a native Windows one... (cached) no
checking for sys/types.h... (cached) yes
checking for netdb.h... (cached) yes
checking if freeaddrinfo can be linked... yes
checking if freeaddrinfo is prototyped... yes
checking if freeaddrinfo is compilable... yes
checking if freeaddrinfo usage allowed... yes
checking if freeaddrinfo might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/xattr.h... yes
checking if fsetxattr can be linked... yes
checking if fsetxattr is prototyped... yes
checking if fsetxattr takes 5 args.... yes
checking if fsetxattr is compilable... yes
checking if fsetxattr usage allowed... yes
checking if fsetxattr might be used... yes
checking if ftruncate can be linked... yes
checking if ftruncate is prototyped... yes
checking if ftruncate is compilable... yes
checking if ftruncate usage allowed... yes
checking if ftruncate might be used... yes
checking for sys/types.h... (cached) yes
checking if getaddrinfo can be linked... yes
checking if getaddrinfo is prototyped... yes
checking if getaddrinfo is compilable... yes
checking if getaddrinfo seems to work... yes
checking if getaddrinfo usage allowed... yes
checking if getaddrinfo might be used... yes
checking if getaddrinfo is threadsafe... yes
checking if gethostbyname can be linked... yes
checking if gethostbyname is prototyped... yes
checking if gethostbyname is compilable... yes
checking if gethostbyname usage allowed... yes
checking if gethostbyname might be used... yes
checking if gethostbyname_r can be linked... yes
checking if gethostbyname_r is prototyped... yes
checking if gethostbyname_r takes 3 args.... no
checking if gethostbyname_r takes 5 args.... no
checking if gethostbyname_r takes 6 args.... yes
checking if gethostbyname_r is compilable... yes
checking if gethostbyname_r usage allowed... yes
checking if gethostbyname_r might be used... yes
checking if gethostname can be linked... yes
checking if gethostname is prototyped... yes
checking if gethostname is compilable... yes
checking for gethostname arg 2 data type... size_t
checking if gethostname usage allowed... yes
checking if gethostname might be used... yes
checking if getpeername can be linked... yes
checking if getpeername is prototyped... yes
checking if getpeername is compilable... yes
checking if getpeername usage allowed... yes
checking if getpeername might be used... yes
checking if getsockname can be linked... yes
checking if getsockname is prototyped... yes
checking if getsockname is compilable... yes
checking if getsockname usage allowed... yes
checking if getsockname might be used... yes
checking for net/if.h... (cached) yes
checking if if_nametoindex can be linked... yes
checking if if_nametoindex is prototyped... yes
checking if if_nametoindex is compilable... yes
checking if if_nametoindex usage allowed... yes
checking if if_nametoindex might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for netinet/in.h... (cached) yes
checking for ifaddrs.h... yes
checking if getifaddrs can be linked... yes
checking if getifaddrs is prototyped... yes
checking if getifaddrs is compilable... yes
checking if getifaddrs seems to work... yes
checking if getifaddrs usage allowed... yes
checking if getifaddrs might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking if gmtime_r can be linked... yes
checking if gmtime_r is prototyped... yes
checking if gmtime_r is compilable... yes
checking if gmtime_r seems to work... yes
checking if gmtime_r usage allowed... yes
checking if gmtime_r might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for netinet/in.h... (cached) yes
checking for arpa/inet.h... (cached) yes
checking if inet_ntop can be linked... yes
checking if inet_ntop is prototyped... yes
checking if inet_ntop is compilable... yes
checking if inet_ntop seems to work... yes
checking if inet_ntop usage allowed... yes
checking if inet_ntop might be used... yes
checking if inet_pton can be linked... yes
checking if inet_pton is prototyped... yes
checking if inet_pton is compilable... yes
checking if inet_pton seems to work... yes
checking if inet_pton usage allowed... yes
checking if inet_pton might be used... yes
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for sys/ioctl.h... (cached) yes
checking for stropts.h... no
checking if ioctl can be linked... yes
checking if ioctl is prototyped... yes
checking if ioctl is compilable... yes
checking if ioctl usage allowed... yes
checking if ioctl might be used... yes
checking if ioctl FIONBIO is compilable... yes
checking if ioctl FIONBIO usage allowed... yes
checking if ioctl FIONBIO might be used... yes
checking if ioctl SIOCGIFADDR is compilable... yes
checking if ioctl SIOCGIFADDR usage allowed... yes
checking if ioctl SIOCGIFADDR might be used... yes
checking if ioctlsocket can be linked... no
checking if ioctlsocket might be used... no
checking if IoctlSocket can be linked... no
checking if IoctlSocket might be used... no
checking if memrchr can be linked... yes
checking if memrchr is prototyped... no
checking if memrchr might be used... no
checking for sys/types.h... (cached) yes
checking for poll.h... (cached) yes
checking for sys/poll.h... (cached) yes
checking if poll can be linked... yes
checking if poll is prototyped... yes
checking if poll is compilable... yes
checking if poll seems to work... yes
checking if poll usage allowed... yes
checking if poll might be used... yes
checking for sys/types.h... (cached) yes
checking if sigaction can be linked... yes
checking if sigaction is prototyped... yes
checking if sigaction is compilable... yes
checking if sigaction usage allowed... yes
checking if sigaction might be used... yes
checking if siginterrupt can be linked... yes
checking if siginterrupt is prototyped... yes
checking if siginterrupt is compilable... yes
checking if siginterrupt usage allowed... yes
checking if siginterrupt might be used... yes
checking if signal can be linked... yes
checking if signal is prototyped... yes
checking if signal is compilable... yes
checking if signal usage allowed... yes
checking if signal might be used... yes
checking for sys/types.h... (cached) yes
checking if sigsetjmp can be linked... no
checking if sigsetjmp seems a macro... yes
checking if sigsetjmp is compilable... yes
checking if sigsetjmp usage allowed... yes
checking if sigsetjmp might be used... yes
checking if socket can be linked... yes
checking if socket is prototyped... yes
checking if socket is compilable... yes
checking if socket usage allowed... yes
checking if socket might be used... yes
checking if socketpair can be linked... yes
checking if socketpair is prototyped... yes
checking if socketpair is compilable... yes
checking if socketpair usage allowed... yes
checking if socketpair might be used... yes
checking if strcasecmp can be linked... yes
checking if strcasecmp is prototyped... yes
checking if strcasecmp is compilable... yes
checking if strcasecmp usage allowed... yes
checking if strcasecmp might be used... yes
checking if strcmpi can be linked... no
checking if strcmpi might be used... no
checking if strdup can be linked... yes
checking if strdup is prototyped... yes
checking if strdup is compilable... yes
checking if strdup usage allowed... yes
checking if strdup might be used... yes
checking if strerror_r can be linked... yes
checking if strerror_r is prototyped... yes
checking if strerror_r is compilable... yes
checking if strerror_r is glibc like... no
checking if strerror_r is POSIX like... yes
checking if strerror_r seems to work... yes
checking if strerror_r usage allowed... yes
checking if strerror_r might be used... yes
checking if stricmp can be linked... no
checking if stricmp might be used... no
checking if strtok_r can be linked... yes
checking if strtok_r is prototyped... yes
checking if strtok_r is compilable... yes
checking if strtok_r usage allowed... yes
checking if strtok_r might be used... yes
checking if strtoll can be linked... yes
checking if strtoll is prototyped... yes
checking if strtoll is compilable... yes
checking if strtoll usage allowed... yes
checking if strtoll might be used... yes
checking for ccache gcc options needed to detect all undeclared functions... none needed
checking whether getpwuid_r is declared... yes
checking for _fseeki64... no
checking for arc4random... no
checking for eventfd... yes
checking for fnmatch... yes
checking for geteuid... yes
checking for getpass_r... no
checking for getppid... yes
checking for getpwuid... yes
checking for getpwuid_r... yes
checking for getrlimit... yes
checking for gettimeofday... yes
checking for if_nametoindex... yes
checking for mach_absolute_time... no
checking for pipe... yes
checking for sched_yield... yes
checking for sendmsg... yes
checking for setlocale... yes
checking for setmode... no
checking for setrlimit... yes
checking for snprintf... yes
checking for utime... yes
checking for utimes... yes
checking for fseeko... yes
checking whether fseeko is declared... yes
checking how to set a socket into non-blocking mode... fcntl O_NONBLOCK
checking whether to enable the threaded resolver... yes
checking whether to link macOS CoreFoundation, CoreServices, and SystemConfiguration frameworks... no
checking whether to use POSIX threads for threaded resolver... auto
checking for pthread.h... yes
checking for pthread_create... yes
checking for dirent.h... yes
checking for opendir... yes
checking convert -I options to -isystem... yes
checking whether to enable verbose strings... yes
checking whether to enable SSPI support (Windows native builds only)... no
checking whether to enable basic authentication method... yes
checking whether to enable bearer authentication method... yes
checking whether to enable digest authentication method... yes
checking whether to enable kerberos authentication method... yes
checking whether to enable negotiate authentication method... yes
checking whether to enable aws sig methods... yes
checking whether to support NTLM... yes
checking whether to enable TLS-SRP authentication... yes
checking whether to enable Unix domain sockets... auto
checking for struct sockaddr_un.sun_path... yes
checking whether to support cookies... yes
checking whether to support socketpair... yes
checking whether to support HTTP authentication... yes
checking whether to support DoH... yes
checking whether to support the MIME API... yes
checking whether to support binding connections locally... yes
checking whether to support the form API... yes
checking whether to support date parsing... yes
checking whether to support netrc parsing... yes
checking whether to support progress-meter... yes
checking whether to support the SHA-512/256 hash algorithm... yes
checking whether to support DNS shuffling... yes
checking whether to support curl_easy_option*... yes
checking whether to support alt-svc... yes
checking whether to support headers-api... yes
configure: disables HSTS due to lack of SSL
checking whether to support WebSockets... no
checking whether hiding of library internal symbols will actually happen... yes
checking if this build supports HTTPS-proxy... no
checking that generated files are newer than configure... done
configure: creating ./config.status
config.status: creating Makefile
config.status: creating docs/Makefile
config.status: creating docs/examples/Makefile
config.status: creating docs/libcurl/Makefile
config.status: creating docs/libcurl/opts/Makefile
config.status: creating docs/cmdline-opts/Makefile
config.status: creating include/Makefile
config.status: creating include/curl/Makefile
config.status: creating src/Makefile
config.status: creating lib/Makefile
config.status: creating scripts/Makefile
config.status: creating lib/libcurl.vers
config.status: creating tests/Makefile
config.status: creating tests/config
config.status: creating tests/certs/Makefile
config.status: creating tests/certs/scripts/Makefile
config.status: creating tests/data/Makefile
config.status: creating tests/server/Makefile
config.status: creating tests/libtest/Makefile
config.status: creating tests/unit/Makefile
config.status: creating tests/http/config.ini
config.status: creating tests/http/Makefile
config.status: creating tests/http/clients/Makefile
config.status: creating packages/Makefile
config.status: creating packages/vms/Makefile
config.status: creating curl-config
config.status: creating libcurl.pc
config.status: creating lib/curl_config.h
config.status: executing depfiles commands
config.status: executing libtool commands
configure: Configured to build curl/libcurl:

Host setup: x86_64-pc-linux-gnu
Install prefix: /usr/local
Compiler: ccache gcc
CFLAGS: -Werror-implicit-function-declaration -O2 -Wno-system-headers
CFLAGS extras:
CPPFLAGS:
LDFLAGS:
LIBS: -lpsl -lz

curl version: 8.10.0-DEV
SSL: no (--with-{openssl,gnutls,mbedtls,wolfssl,schannel,secure-transport,amissl,bearssl,rustls} )
SSH: no (--with-{libssh,libssh2})
zlib: enabled
brotli: no (--with-brotli)
zstd: no (--with-zstd)
GSS-API: no (--with-gssapi)
GSASL: no (libgsasl not found)
TLS-SRP: no (--enable-tls-srp)
resolver: POSIX threaded
IPv6: enabled
Unix sockets: enabled
IDN: no (--with-{libidn2,winidn})
Build docs: no
Build libcurl: Shared=no, Static=yes
Built-in manual: no (--enable-manual)
--libcurl option: enabled (--disable-libcurl-option)
Verbose errors: enabled (--disable-verbose)
Code coverage: disabled
SSPI: no (--enable-sspi)
ca cert bundle: no
ca cert path:
ca fallback:
LDAP: no (--enable-ldap / --with-ldap-lib / --with-lber-lib)
LDAPS: no (--enable-ldaps)
RTSP: enabled
RTMP: no (--with-librtmp)
PSL: enabled
Alt-svc: enabled (--disable-alt-svc)
Headers API: enabled (--disable-headers-api)
HSTS: no (--enable-hsts)
HTTP1: enabled (internal)
HTTP2: no (--with-nghttp2)
HTTP3: no (--with-ngtcp2 --with-nghttp3, --with-quiche, --with-openssl-quic, --with-msh3)
ECH: no (--enable-ech)
WebSockets: no (--enable-websockets)
Protocols: dict file ftp gopher http imap ipfs ipns mqtt pop3 rtsp smtp telnet tftp
Features: alt-svc AsynchDNS IPv6 Largefile libz PSL threadsafe UnixSockets

configure: WARNING: Cannot find libraries for LDAP support: LDAP disabled
configure: WARNING: libgsasl was not found
configure: WARNING: Cannot find libidn2

$ make -j3
Making all in lib
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make all-am
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
CC libcurl_la-altsvc.lo
CC libcurl_la-amigaos.lo
CC libcurl_la-asyn-ares.lo
CC libcurl_la-asyn-thread.lo
CC libcurl_la-base64.lo
CC libcurl_la-bufq.lo
CC libcurl_la-bufref.lo
CC libcurl_la-c-hyper.lo
CC libcurl_la-cf-h1-proxy.lo
CC libcurl_la-cf-h2-proxy.lo
CC libcurl_la-cf-haproxy.lo
CC libcurl_la-cf-https-connect.lo
CC libcurl_la-cf-socket.lo
CC libcurl_la-cfilters.lo
CC libcurl_la-conncache.lo
CC libcurl_la-connect.lo
CC libcurl_la-content_encoding.lo
CC libcurl_la-cookie.lo
CC libcurl_la-curl_addrinfo.lo
CC libcurl_la-curl_endian.lo
CC libcurl_la-curl_des.lo
CC libcurl_la-curl_fnmatch.lo
CC libcurl_la-curl_get_line.lo
CC libcurl_la-curl_gethostname.lo
CC libcurl_la-curl_gssapi.lo
CC libcurl_la-curl_memrchr.lo
CC libcurl_la-curl_multibyte.lo
CC libcurl_la-curl_ntlm_core.lo
CC libcurl_la-curl_path.lo
CC libcurl_la-curl_range.lo
CC libcurl_la-curl_rtmp.lo
CC libcurl_la-curl_sasl.lo
CC libcurl_la-curl_sha512_256.lo
CC libcurl_la-curl_sspi.lo
CC libcurl_la-curl_threads.lo
CC libcurl_la-curl_trc.lo
CC libcurl_la-cw-out.lo
CC libcurl_la-dict.lo
CC libcurl_la-dllmain.lo
CC libcurl_la-doh.lo
CC libcurl_la-dynbuf.lo
CC libcurl_la-dynhds.lo
CC libcurl_la-easy.lo
CC libcurl_la-easygetopt.lo
CC libcurl_la-easyoptions.lo
CC libcurl_la-escape.lo
CC libcurl_la-file.lo
CC libcurl_la-fopen.lo
CC libcurl_la-fileinfo.lo
CC libcurl_la-formdata.lo
CC libcurl_la-ftp.lo
CC libcurl_la-ftplistparser.lo
CC libcurl_la-getenv.lo
CC libcurl_la-getinfo.lo
CC libcurl_la-gopher.lo
CC libcurl_la-hash.lo
CC libcurl_la-headers.lo
CC libcurl_la-hmac.lo
CC libcurl_la-hostasyn.lo
CC libcurl_la-hostip.lo
CC libcurl_la-hostip4.lo
CC libcurl_la-hostip6.lo
CC libcurl_la-hostsyn.lo
CC libcurl_la-hsts.lo
CC libcurl_la-http.lo
CC libcurl_la-http1.lo
CC libcurl_la-http2.lo
CC libcurl_la-http_aws_sigv4.lo
CC libcurl_la-http_chunks.lo
CC libcurl_la-http_digest.lo
CC libcurl_la-http_negotiate.lo
CC libcurl_la-http_ntlm.lo
CC libcurl_la-http_proxy.lo
CC libcurl_la-idn.lo
CC libcurl_la-if2ip.lo
CC libcurl_la-imap.lo
CC libcurl_la-inet_ntop.lo
CC libcurl_la-inet_pton.lo
CC libcurl_la-krb5.lo
CC libcurl_la-ldap.lo
CC libcurl_la-llist.lo
CC libcurl_la-macos.lo
CC libcurl_la-md4.lo
CC libcurl_la-md5.lo
CC libcurl_la-memdebug.lo
CC libcurl_la-mime.lo
CC libcurl_la-mprintf.lo
CC libcurl_la-mqtt.lo
CC libcurl_la-multi.lo
CC libcurl_la-netrc.lo
CC libcurl_la-nonblock.lo
CC libcurl_la-noproxy.lo
CC libcurl_la-openldap.lo
CC libcurl_la-parsedate.lo
CC libcurl_la-pingpong.lo
CC libcurl_la-pop3.lo
CC libcurl_la-progress.lo
CC libcurl_la-psl.lo
CC libcurl_la-rand.lo
CC libcurl_la-rename.lo
CC libcurl_la-request.lo
CC libcurl_la-rtsp.lo
CC libcurl_la-select.lo
CC libcurl_la-sendf.lo
CC libcurl_la-setopt.lo
CC libcurl_la-sha256.lo
CC libcurl_la-share.lo
CC libcurl_la-slist.lo
CC libcurl_la-smb.lo
CC libcurl_la-smtp.lo
CC libcurl_la-socketpair.lo
CC libcurl_la-socks.lo
CC libcurl_la-socks_gssapi.lo
CC libcurl_la-socks_sspi.lo
CC libcurl_la-speedcheck.lo
CC libcurl_la-splay.lo
CC libcurl_la-strcase.lo
CC libcurl_la-strdup.lo
CC libcurl_la-strerror.lo
CC libcurl_la-strtok.lo
CC libcurl_la-strtoofft.lo
CC libcurl_la-telnet.lo
CC libcurl_la-system_win32.lo
CC libcurl_la-tftp.lo
CC libcurl_la-timediff.lo
CC libcurl_la-timeval.lo
CC libcurl_la-transfer.lo
CC libcurl_la-url.lo
CC libcurl_la-urlapi.lo
CC libcurl_la-version.lo
CC libcurl_la-version_win32.lo
CC libcurl_la-warnless.lo
CC libcurl_la-ws.lo
CC vauth/libcurl_la-cleartext.lo
CC vauth/libcurl_la-cram.lo
CC vauth/libcurl_la-digest.lo
CC vauth/libcurl_la-digest_sspi.lo
CC vauth/libcurl_la-gsasl.lo
CC vauth/libcurl_la-krb5_gssapi.lo
CC vauth/libcurl_la-krb5_sspi.lo
CC vauth/libcurl_la-ntlm.lo
CC vauth/libcurl_la-ntlm_sspi.lo
CC vauth/libcurl_la-oauth2.lo
CC vauth/libcurl_la-spnego_gssapi.lo
CC vauth/libcurl_la-spnego_sspi.lo
CC vauth/libcurl_la-vauth.lo
CC vtls/libcurl_la-bearssl.lo
CC vtls/libcurl_la-cipher_suite.lo
CC vtls/libcurl_la-gtls.lo
CC vtls/libcurl_la-hostcheck.lo
CC vtls/libcurl_la-keylog.lo
CC vtls/libcurl_la-mbedtls.lo
CC vtls/libcurl_la-mbedtls_threadlock.lo
CC vtls/libcurl_la-openssl.lo
CC vtls/libcurl_la-rustls.lo
CC vtls/libcurl_la-schannel.lo
CC vtls/libcurl_la-schannel_verify.lo
CC vtls/libcurl_la-sectransp.lo
CC vtls/libcurl_la-vtls.lo
CC vtls/libcurl_la-wolfssl.lo
CC vtls/libcurl_la-x509asn1.lo
CC vquic/libcurl_la-curl_msh3.lo
CC vquic/libcurl_la-curl_ngtcp2.lo
CC vquic/libcurl_la-curl_osslq.lo
CC vquic/libcurl_la-curl_quiche.lo
CC vquic/libcurl_la-vquic.lo
CC vquic/libcurl_la-vquic-tls.lo
CC vssh/libcurl_la-libssh.lo
CC vssh/libcurl_la-libssh2.lo
CC vssh/libcurl_la-wolfssh.lo
CCLD libcurl.la
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
Making all in docs
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in .
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
make[2]: Nothing to be done for 'all-am'.
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in cmdline-opts
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[2]: Nothing to be done for 'all'.
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
Making all in libcurl
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
Making all in opts
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl/opts'
make[3]: Nothing to be done for 'all'.
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl/opts'
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[3]: Nothing to be done for 'all-am'.
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in src
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/src'
CC slist_wc.o
CC terminal.o
CC tool_binmode.o
CC tool_bname.o
CC tool_cb_dbg.o
CC tool_cb_hdr.o
CC tool_cb_prg.o
CC tool_cb_rea.o
CC tool_cb_see.o
CC tool_cb_soc.o
CC tool_cb_wrt.o
CC tool_cfgable.o
CC tool_dirhie.o
CC tool_easysrc.o
CC tool_doswin.o
CC tool_filetime.o
CC tool_findfile.o
CC tool_formparse.o
CC tool_getparam.o
CC tool_getpass.o
CC tool_help.o
echo '#include "tool_hugehelp.h"' >> tool_hugehelp.c
CC tool_helpers.o
CC tool_ipfs.o
CC tool_libinfo.o
CC tool_main.o
CC tool_listhelp.o
CC tool_msgs.o
CC tool_operate.o
CC tool_operhlp.o
CC tool_paramhlp.o
CC tool_parsecfg.o
CC tool_progress.o
CC tool_setopt.o
CC tool_sleep.o
CC tool_stderr.o
CC tool_strdup.o
CC tool_urlglob.o
CC tool_util.o
CC tool_vms.o
CC tool_writeout.o
CC tool_writeout_json.o
CC tool_xattr.o
CC var.o
echo 'extern const void *curl_ca_embed; const void *curl_ca_embed;' > tool_ca_embed.c
CC tool_hugehelp.o
CC tool_ca_embed.o
CC ../lib/base64.o
CC ../lib/curl_multibyte.o
CC ../lib/dynbuf.o
CC ../lib/nonblock.o
CC ../lib/strtoofft.o
CC ../lib/timediff.o
CC ../lib/version_win32.o
CC ../lib/warnless.o
CCLD curl
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/src'
Making all in scripts
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/scripts'
make[1]: Nothing to be done for 'all'.
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/scripts'
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0'
make[1]: Nothing to be done for 'all-am'.
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0'

Commit Diff GitHub →

lib/cf-h1-proxy.c+1 -2

@@ -489,8 +489,7 @@ static CURLcode recv_CONNECT_resp(struct Curl_cfilter *cf,
	ts->keepon = KEEPON_IGNORE;

	if(ts->cl) {
-	infof(data, "Ignore %" CURL_FORMAT_CURL_OFF_T
-	" bytes of response-body", ts->cl);
+	infof(data, "Ignore %" FMT_OFF_T " bytes of response-body", ts->cl);
	}
	else if(ts->chunked_encoding) {
	infof(data, "Ignore chunked response-body");

lib/cf-socket.c+24 -29

@@ -183,7 +183,7 @@ tcpkeepalive(struct Curl_easy *data,
	if(setsockopt(sockfd, SOL_SOCKET, SO_KEEPALIVE,
	(void *)&optval, sizeof(optval)) < 0) {
	infof(data, "Failed to set SO_KEEPALIVE on fd "
-	"%" CURL_FORMAT_SOCKET_T ": errno %d",
+	"%" FMT_SOCKET_T ": errno %d",
	sockfd, SOCKERRNO);
	}
	else {
@@ -195,7 +195,7 @@ tcpkeepalive(struct Curl_easy *data,
	if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPIDLE,
	(const char *)&optval, sizeof(optval)) < 0) {
	infof(data, "Failed to set TCP_KEEPIDLE on fd "
-	"%" CURL_FORMAT_SOCKET_T ": errno %d",
+	"%" FMT_SOCKET_T ": errno %d",
	sockfd, SOCKERRNO);
	}
	optval = curlx_sltosi(data->set.tcp_keepintvl);
@@ -203,14 +203,14 @@ tcpkeepalive(struct Curl_easy *data,
	if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPINTVL,
	(const char *)&optval, sizeof(optval)) < 0) {
	infof(data, "Failed to set TCP_KEEPINTVL on fd "
-	"%" CURL_FORMAT_SOCKET_T ": errno %d",
+	"%" FMT_SOCKET_T ": errno %d",
	sockfd, SOCKERRNO);
	}
	optval = curlx_sltosi(data->set.tcp_keepcnt);
	if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPCNT,
	(const char *)&optval, sizeof(optval)) < 0) {
	infof(data, "Failed to set TCP_KEEPCNT on fd "
-	"%" CURL_FORMAT_SOCKET_T ": errno %d",
+	"%" FMT_SOCKET_T ": errno %d",
	sockfd, SOCKERRNO);
	}
	#else /* Windows < 10.0.16299 */
@@ -226,8 +226,7 @@ tcpkeepalive(struct Curl_easy *data,
	if(WSAIoctl(sockfd, SIO_KEEPALIVE_VALS, (LPVOID) &vals, sizeof(vals),
	NULL, 0, &dummy, NULL, NULL) != 0) {
	infof(data, "Failed to set SIO_KEEPALIVE_VALS on fd "
-	"%" CURL_FORMAT_SOCKET_T ": errno %d",
-	sockfd, SOCKERRNO);
+	"%" FMT_SOCKET_T ": errno %d", sockfd, SOCKERRNO);
	}
	#endif
	#else /* !Windows */
@@ -237,7 +236,7 @@ tcpkeepalive(struct Curl_easy *data,
	if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPIDLE,
	(void *)&optval, sizeof(optval)) < 0) {
	infof(data, "Failed to set TCP_KEEPIDLE on fd "
-	"%" CURL_FORMAT_SOCKET_T ": errno %d",
+	"%" FMT_SOCKET_T ": errno %d",
	sockfd, SOCKERRNO);
	}
	#elif defined(TCP_KEEPALIVE)
@@ -247,7 +246,7 @@ tcpkeepalive(struct Curl_easy *data,
	if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPALIVE,
	(void *)&optval, sizeof(optval)) < 0) {
	infof(data, "Failed to set TCP_KEEPALIVE on fd "
-	"%" CURL_FORMAT_SOCKET_T ": errno %d",
+	"%" FMT_SOCKET_T ": errno %d",
	sockfd, SOCKERRNO);
	}
	#elif defined(TCP_KEEPALIVE_THRESHOLD)
@@ -257,7 +256,7 @@ tcpkeepalive(struct Curl_easy *data,
	if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPALIVE_THRESHOLD,
	(void *)&optval, sizeof(optval)) < 0) {
	infof(data, "Failed to set TCP_KEEPALIVE_THRESHOLD on fd "
-	"%" CURL_FORMAT_SOCKET_T ": errno %d",
+	"%" FMT_SOCKET_T ": errno %d",
	sockfd, SOCKERRNO);
	}
	#endif
@@ -267,7 +266,7 @@ tcpkeepalive(struct Curl_easy *data,
	if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPINTVL,
	(void *)&optval, sizeof(optval)) < 0) {
	infof(data, "Failed to set TCP_KEEPINTVL on fd "
-	"%" CURL_FORMAT_SOCKET_T ": errno %d",
+	"%" FMT_SOCKET_T ": errno %d",
	sockfd, SOCKERRNO);
	}
	#elif defined(TCP_KEEPALIVE_ABORT_THRESHOLD)
@@ -288,8 +287,7 @@ tcpkeepalive(struct Curl_easy *data,
	if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPALIVE_ABORT_THRESHOLD,
	(void *)&optval, sizeof(optval)) < 0) {
	infof(data, "Failed to set TCP_KEEPALIVE_ABORT_THRESHOLD on fd "
-	"%" CURL_FORMAT_SOCKET_T ": errno %d",
-	sockfd, SOCKERRNO);
+	"%" FMT_SOCKET_T ": errno %d", sockfd, SOCKERRNO);
	}
	#endif
	#ifdef TCP_KEEPCNT
@@ -297,8 +295,7 @@ tcpkeepalive(struct Curl_easy *data,
	if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPCNT,
	(void *)&optval, sizeof(optval)) < 0) {
	infof(data, "Failed to set TCP_KEEPCNT on fd "
-	"%" CURL_FORMAT_SOCKET_T ": errno %d",
-	sockfd, SOCKERRNO);
+	"%" FMT_SOCKET_T ": errno %d", sockfd, SOCKERRNO);
	}
	#endif
	#endif
@@ -1001,8 +998,7 @@ static void cf_socket_close(struct Curl_cfilter cf, struct Curl_easy data)
	struct cf_socket_ctx *ctx = cf->ctx;

	if(ctx && CURL_SOCKET_BAD != ctx->sock) {
-	CURL_TRC_CF(data, cf, "cf_socket_close(%" CURL_FORMAT_SOCKET_T
-	")", ctx->sock);
+	CURL_TRC_CF(data, cf, "cf_socket_close(%" FMT_SOCKET_T ")", ctx->sock);
	if(ctx->sock == cf->conn->sock[cf->sockindex])
	cf->conn->sock[cf->sockindex] = CURL_SOCKET_BAD;
	socket_close(data, cf->conn, !ctx->accepted, ctx->sock);
@@ -1024,8 +1020,7 @@ static CURLcode cf_socket_shutdown(struct Curl_cfilter *cf,
	if(cf->connected) {
	struct cf_socket_ctx *ctx = cf->ctx;

-	CURL_TRC_CF(data, cf, "cf_socket_shutdown(%" CURL_FORMAT_SOCKET_T
-	")", ctx->sock);
+	CURL_TRC_CF(data, cf, "cf_socket_shutdown(%" FMT_SOCKET_T ")", ctx->sock);
	/* On TCP, and when the socket looks well and non-blocking mode
	* can be enabled, receive dangling bytes before close to avoid
	* entering RST states unnecessarily. */
@@ -1235,7 +1230,7 @@ out:
	ctx->connected_at = Curl_now();
	cf->connected = TRUE;
	}
-	CURL_TRC_CF(data, cf, "cf_socket_open() -> %d, fd=%" CURL_FORMAT_SOCKET_T,
+	CURL_TRC_CF(data, cf, "cf_socket_open() -> %d, fd=%" FMT_SOCKET_T,
	result, ctx->sock);
	return result;
	}
@@ -1277,8 +1272,8 @@ static int do_connect(struct Curl_cfilter cf, struct Curl_easy data,
	#elif defined(TCP_FASTOPEN_CONNECT) /* Linux >= 4.11 */
	if(setsockopt(ctx->sock, IPPROTO_TCP, TCP_FASTOPEN_CONNECT,
	(void *)&optval, sizeof(optval)) < 0)
-	infof(data, "Failed to enable TCP Fast Open on fd %"
-	CURL_FORMAT_SOCKET_T, ctx->sock);
+	infof(data, "Failed to enable TCP Fast Open on fd %" FMT_SOCKET_T,
+	ctx->sock);

	rc = connect(ctx->sock, &ctx->addr.sa_addr, ctx->addr.addrlen);
	#elif defined(MSG_FASTOPEN) /* old Linux */
@@ -1416,12 +1411,12 @@ static void cf_socket_adjust_pollset(struct Curl_cfilter *cf,
	if(!cf->connected) {
	Curl_pollset_set_out_only(data, ps, ctx->sock);
	CURL_TRC_CF(data, cf, "adjust_pollset, !connected, POLLOUT fd=%"
-	CURL_FORMAT_SOCKET_T, ctx->sock);
+	FMT_SOCKET_T, ctx->sock);
	}
	else if(!ctx->active) {
	Curl_pollset_add_in(data, ps, ctx->sock);
	CURL_TRC_CF(data, cf, "adjust_pollset, !active, POLLIN fd=%"
-	CURL_FORMAT_SOCKET_T, ctx->sock);
+	FMT_SOCKET_T, ctx->sock);
	}
	}
	}
@@ -1825,7 +1820,7 @@ static CURLcode cf_udp_setup_quic(struct Curl_cfilter *cf,
	}
	ctx->sock_connected = TRUE;
	set_local_ip(cf, data);
-	CURL_TRC_CF(data, cf, "%s socket %" CURL_FORMAT_SOCKET_T
+	CURL_TRC_CF(data, cf, "%s socket %" FMT_SOCKET_T
	" connected: [%s:%d] -> [%s:%d]",
	(ctx->transport == TRNSPRT_QUIC)? "QUIC" : "UDP",
	ctx->sock, ctx->ip.local_ip, ctx->ip.local_port,
@@ -1890,12 +1885,12 @@ static CURLcode cf_udp_connect(struct Curl_cfilter *cf,
	if(result)
	goto out;
	CURL_TRC_CF(data, cf, "cf_udp_connect(), opened socket=%"
-	CURL_FORMAT_SOCKET_T " (%s:%d)",
+	FMT_SOCKET_T " (%s:%d)",
	ctx->sock, ctx->ip.local_ip, ctx->ip.local_port);
	}
	else {
	CURL_TRC_CF(data, cf, "cf_udp_connect(), opened socket=%"
-	CURL_FORMAT_SOCKET_T " (unconnected)", ctx->sock);
+	FMT_SOCKET_T " (unconnected)", ctx->sock);
	}
	*done = TRUE;
	cf->connected = TRUE;
@@ -2070,8 +2065,8 @@ CURLcode Curl_conn_tcp_listen_set(struct Curl_easy *data,
	ctx->active = TRUE;
	ctx->connected_at = Curl_now();
	cf->connected = TRUE;
-	CURL_TRC_CF(data, cf, "Curl_conn_tcp_listen_set(%"
-	CURL_FORMAT_SOCKET_T ")", ctx->sock);
+	CURL_TRC_CF(data, cf, "Curl_conn_tcp_listen_set(%" FMT_SOCKET_T ")",
+	ctx->sock);

	out:
	if(result) {
@@ -2135,7 +2130,7 @@ CURLcode Curl_conn_tcp_accepted_set(struct Curl_easy *data,
	ctx->accepted = TRUE;
	ctx->connected_at = Curl_now();
	cf->connected = TRUE;
-	CURL_TRC_CF(data, cf, "accepted_set(sock=%" CURL_FORMAT_SOCKET_T
+	CURL_TRC_CF(data, cf, "accepted_set(sock=%" FMT_SOCKET_T
	", remote=%s port=%d)",
	ctx->sock, ctx->ip.remote_ip, ctx->ip.remote_port);

lib/conncache.c+25 -26

@@ -325,7 +325,7 @@ int Curl_cpool_check_limits(struct Curl_easy *data,
	break;
	/* disconnect the old conn and continue */
	DEBUGF(infof(data, "Discarding connection #%"
-	CURL_FORMAT_CURL_OFF_T " from %zu to reach destination "
+	FMT_OFF_T " from %zu to reach destination "
	"limit of %zu", oldest_idle->connection_id,
	Curl_llist_count(&bundle->conns), dest_limit));
	Curl_cpool_disconnect(data, oldest_idle, FALSE);
@@ -343,7 +343,7 @@ int Curl_cpool_check_limits(struct Curl_easy *data,
	break;
	/* disconnect the old conn and continue */
	DEBUGF(infof(data, "Discarding connection #%"
-	CURL_FORMAT_CURL_OFF_T " from %zu to reach total "
+	FMT_OFF_T " from %zu to reach total "
	"limit of %zu",
	oldest_idle->connection_id, cpool->num_conn, total_limit));
	Curl_cpool_disconnect(data, oldest_idle, FALSE);
@@ -384,7 +384,7 @@ CURLcode Curl_cpool_add_conn(struct Curl_easy *data,
	cpool_bundle_add(bundle, conn);
	conn->connection_id = cpool->next_connection_id++;
	cpool->num_conn++;
-	DEBUGF(infof(data, "Added connection %" CURL_FORMAT_CURL_OFF_T ". "
+	DEBUGF(infof(data, "Added connection %" FMT_OFF_T ". "
	"The cache now contains %zu members",
	conn->connection_id, cpool->num_conn));
	out:
@@ -636,8 +636,8 @@ static void cpool_shutdown_discard_all(struct cpool *cpool)
	while(e) {
	conn = Curl_node_elem(e);
	Curl_node_remove(e);
-	DEBUGF(infof(cpool->idata, "discard connection #%"
-	CURL_FORMAT_CURL_OFF_T, conn->connection_id));
+	DEBUGF(infof(cpool->idata, "discard connection #%" FMT_OFF_T,
+	conn->connection_id));
	cpool_close_and_destroy(cpool, conn, NULL, FALSE);
	e = Curl_llist_head(&cpool->shutdowns);
	}
@@ -719,9 +719,9 @@ static void cpool_discard_conn(struct cpool *cpool,
	* are other users of it
	*/
	if(CONN_INUSE(conn) && !aborted) {
-	DEBUGF(infof(data, "[CCACHE] not discarding #%" CURL_FORMAT_CURL_OFF_T
-	" still in use by %zu transfers", conn->connection_id,
-	CONN_INUSE(conn)));
+	DEBUGF(infof(data, "[CCACHE] not discarding #%" FMT_OFF_T
+	" still in use by %zu transfers", conn->connection_id,
+	CONN_INUSE(conn)));
	return;
	}

@@ -742,8 +742,8 @@ static void cpool_discard_conn(struct cpool *cpool,
	/* Attempt to shutdown the connection right away. */
	Curl_attach_connection(data, conn);
	cpool_run_conn_shutdown(data, conn, &done);
-	DEBUGF(infof(data, "[CCACHE] shutdown #%" CURL_FORMAT_CURL_OFF_T
-	", done=%d",conn->connection_id, done));
+	DEBUGF(infof(data, "[CCACHE] shutdown #%" FMT_OFF_T ", done=%d",
+	conn->connection_id, done));
	Curl_detach_connection(data);
	}

@@ -770,17 +770,17 @@ static void cpool_discard_conn(struct cpool *cpool,
	memset(&conn->shutdown_poll, 0, sizeof(conn->shutdown_poll));
	if(cpool_update_shutdown_ev(data->multi, cpool->idata, conn)) {
	DEBUGF(infof(data, "[CCACHE] update events for shutdown failed, "
-	"discarding #%" CURL_FORMAT_CURL_OFF_T,
-	conn->connection_id));
+	"discarding #%" FMT_OFF_T,
+	conn->connection_id));
	cpool_close_and_destroy(cpool, conn, data, FALSE);
	return;
	}
	}

	Curl_llist_append(&cpool->shutdowns, conn, &conn->cpool_node);
-	DEBUGF(infof(data, "[CCACHE] added #%" CURL_FORMAT_CURL_OFF_T
-	" to shutdown list of length %zu", conn->connection_id,
-	Curl_llist_count(&cpool->shutdowns)));
+	DEBUGF(infof(data, "[CCACHE] added #%" FMT_OFF_T
+	" to shutdown list of length %zu", conn->connection_id,
+	Curl_llist_count(&cpool->shutdowns)));
	}

	void Curl_cpool_disconnect(struct Curl_easy *data,
@@ -819,14 +819,13 @@ void Curl_cpool_disconnect(struct Curl_easy *data,

	if(data->multi) {
	/* Add it to the multi's cpool for shutdown handling */
-	infof(data, "%s connection #%" CURL_FORMAT_CURL_OFF_T,
+	infof(data, "%s connection #%" FMT_OFF_T,
	aborted? "closing" : "shutting down", conn->connection_id);
	cpool_discard_conn(&data->multi->cpool, data, conn, aborted);
	}
	else {
	/* No multi available. Make a best-effort shutdown + close */
-	infof(data, "closing connection #%" CURL_FORMAT_CURL_OFF_T,
-	conn->connection_id);
+	infof(data, "closing connection #%" FMT_OFF_T, conn->connection_id);
	cpool_close_and_destroy(NULL, conn, data, !aborted);
	}

@@ -849,7 +848,7 @@ static void cpool_run_conn_shutdown_handler(struct Curl_easy *data,

	if(conn->handler && conn->handler->disconnect) {
	/* This is set if protocol-specific cleanups should be made */
-	DEBUGF(infof(data, "connection #%" CURL_FORMAT_CURL_OFF_T
+	DEBUGF(infof(data, "connection #%" FMT_OFF_T
	", shutdown protocol handler (aborted=%d)",
	conn->connection_id, conn->bits.aborted));

@@ -990,8 +989,8 @@ static void cpool_perform(struct cpool *cpool)
	conn = Curl_node_elem(e);
	Curl_attach_connection(data, conn);
	cpool_run_conn_shutdown(data, conn, &done);
-	DEBUGF(infof(data, "[CCACHE] shutdown #%" CURL_FORMAT_CURL_OFF_T
-	", done=%d", conn->connection_id, done));
+	DEBUGF(infof(data, "[CCACHE] shutdown #%" FMT_OFF_T ", done=%d",
+	conn->connection_id, done));
	Curl_detach_connection(data);
	if(done) {
	Curl_node_remove(e);
@@ -1055,10 +1054,10 @@ static void cpool_close_and_destroy(struct cpool *cpool,
	}

	if(cpool)
-	DEBUGF(infof(data, "[CCACHE] closing #%" CURL_FORMAT_CURL_OFF_T,
+	DEBUGF(infof(data, "[CCACHE] closing #%" FMT_OFF_T,
	conn->connection_id));
	else
-	DEBUGF(infof(data, "closing connection #%" CURL_FORMAT_CURL_OFF_T,
+	DEBUGF(infof(data, "closing connection #%" FMT_OFF_T,
	conn->connection_id));
	Curl_conn_close(data, SECONDARYSOCKET);
	Curl_conn_close(data, FIRSTSOCKET);
@@ -1109,8 +1108,8 @@ void Curl_cpool_multi_socket(struct Curl_multi *multi,
	if(s == conn->sock[FIRSTSOCKET] \|\| s == conn->sock[SECONDARYSOCKET]) {
	Curl_attach_connection(data, conn);
	cpool_run_conn_shutdown(data, conn, &done);
-	DEBUGF(infof(data, "[CCACHE] shutdown #%" CURL_FORMAT_CURL_OFF_T
-	", done=%d", conn->connection_id, done));
+	DEBUGF(infof(data, "[CCACHE] shutdown #%" FMT_OFF_T ", done=%d",
+	conn->connection_id, done));
	Curl_detach_connection(data);
	if(done \|\| cpool_update_shutdown_ev(multi, data, conn)) {
	Curl_node_remove(e);
@@ -1160,7 +1159,7 @@ static void cpool_shutdown_all(struct cpool *cpool,
	for(conn = cpool_get_live_conn(cpool); conn;
	conn = cpool_get_live_conn(cpool)) {
	/* Move conn from live set to shutdown or destroy right away */
-	DEBUGF(infof(data, "moving connection #%" CURL_FORMAT_CURL_OFF_T
+	DEBUGF(infof(data, "moving connection #%" FMT_OFF_T
	" to shutdown queue", conn->connection_id));
	cpool_remove_conn(cpool, conn);
	cpool_discard_conn(cpool, data, conn, FALSE);

lib/connect.c+6 -9

@@ -581,7 +581,7 @@ static CURLcode baller_connect(struct Curl_cfilter *cf,
	baller->is_done = TRUE;
	}
	else if(Curl_timediff(*now, baller->started) >= baller->timeoutms) {
-	infof(data, "%s connect timeout after %" CURL_FORMAT_TIMEDIFF_T
+	infof(data, "%s connect timeout after %" FMT_TIMEDIFF_T
	"ms, move on!", baller->name, baller->timeoutms);
	#if defined(ETIMEDOUT)
	baller->error = ETIMEDOUT;
@@ -672,7 +672,7 @@ evaluate:
	/* Nothing connected, check the time before we might
	* start new ballers or return ok. */
	if((ongoing \|\| not_started) && Curl_timeleft(data, &now, TRUE) < 0) {
-	failf(data, "Connection timeout after %" CURL_FORMAT_CURL_OFF_T " ms",
+	failf(data, "Connection timeout after %" FMT_OFF_T " ms",
	Curl_timediff(now, data->progress.t_startsingle));
	return CURLE_OPERATION_TIMEDOUT;
	}
@@ -695,8 +695,7 @@ evaluate:
	CURL_TRC_CF(data, cf, "%s done", baller->name);
	}
	else {
-	CURL_TRC_CF(data, cf, "%s starting (timeout=%"
-	CURL_FORMAT_TIMEDIFF_T "ms)",
+	CURL_TRC_CF(data, cf, "%s starting (timeout=%" FMT_TIMEDIFF_T "ms)",
	baller->name, baller->timeoutms);
	++ongoing;
	++added;
@@ -741,7 +740,7 @@ evaluate:
	hostname = conn->host.name;

	failf(data, "Failed to connect to %s port %u after "
-	"%" CURL_FORMAT_TIMEDIFF_T " ms: %s",
+	"%" FMT_TIMEDIFF_T " ms: %s",
	hostname, conn->primary.remote_port,
	Curl_timediff(now, data->progress.t_startsingle),
	curl_easy_strerror(result));
@@ -834,8 +833,7 @@ static CURLcode start_connect(struct Curl_cfilter *cf,
	timeout_ms, EXPIRE_DNS_PER_NAME);
	if(result)
	return result;
-	CURL_TRC_CF(data, cf, "created %s (timeout %"
-	CURL_FORMAT_TIMEDIFF_T "ms)",
+	CURL_TRC_CF(data, cf, "created %s (timeout %" FMT_TIMEDIFF_T "ms)",
	ctx->baller[0]->name, ctx->baller[0]->timeoutms);
	if(addr1) {
	/* second one gets a delayed start */
@@ -846,8 +844,7 @@ static CURLcode start_connect(struct Curl_cfilter *cf,
	timeout_ms, EXPIRE_DNS_PER_NAME2);
	if(result)
	return result;
-	CURL_TRC_CF(data, cf, "created %s (timeout %"
-	CURL_FORMAT_TIMEDIFF_T "ms)",
+	CURL_TRC_CF(data, cf, "created %s (timeout %" FMT_TIMEDIFF_T "ms)",
	ctx->baller[1]->name, ctx->baller[1]->timeoutms);
	Curl_expire(data, data->set.happy_eyeballs_timeout,
	EXPIRE_HAPPY_EYEBALLS);

lib/cookie.c+2 -2

@@ -1170,7 +1170,7 @@ Curl_cookie_add(struct Curl_easy *data,
	if(c->running)
	/* Only show this when NOT reading the cookies from a file */
	infof(data, "%s cookie %s=\"%s\" for domain %s, path %s, "
-	"expire %" CURL_FORMAT_CURL_OFF_T,
+	"expire %" FMT_OFF_T,
	replace_old?"Replaced":"Added", co->name, co->value,
	co->domain, co->path, co->expires);

@@ -1589,7 +1589,7 @@ static char get_netscape_format(const struct Cookie co)
	"%s\t" /* tailmatch */
	"%s\t" /* path */
	"%s\t" /* secure */
-	"%" CURL_FORMAT_CURL_OFF_T "\t" /* expires */
+	"%" FMT_OFF_T "\t" /* expires */
	"%s\t" /* name */
	"%s", /* value */
	co->httponly?"#HttpOnly_":"",

lib/curl_range.c+6 -9

@@ -55,15 +55,13 @@ CURLcode Curl_range(struct Curl_easy *data)
	if((to_t == CURL_OFFT_INVAL) && !from_t) {
	/* X - */
	data->state.resume_from = from;
-	DEBUGF(infof(data, "RANGE %" CURL_FORMAT_CURL_OFF_T " to end of file",
-	from));
+	DEBUGF(infof(data, "RANGE %" FMT_OFF_T " to end of file", from));
	}
	else if((from_t == CURL_OFFT_INVAL) && !to_t) {
	/* -Y */
	data->req.maxdownload = to;
	data->state.resume_from = -to;
-	DEBUGF(infof(data, "RANGE the last %" CURL_FORMAT_CURL_OFF_T " bytes",
-	to));
+	DEBUGF(infof(data, "RANGE the last %" FMT_OFF_T " bytes", to));
	}
	else {
	/* X-Y */
@@ -79,13 +77,12 @@ CURLcode Curl_range(struct Curl_easy *data)

	data->req.maxdownload = totalsize + 1; /* include last byte */
	data->state.resume_from = from;
-	DEBUGF(infof(data, "RANGE from %" CURL_FORMAT_CURL_OFF_T
-	" getting %" CURL_FORMAT_CURL_OFF_T " bytes",
+	DEBUGF(infof(data, "RANGE from %" FMT_OFF_T
+	" getting %" FMT_OFF_T " bytes",
	from, data->req.maxdownload));
	}
-	DEBUGF(infof(data, "range-download from %" CURL_FORMAT_CURL_OFF_T
-	" to %" CURL_FORMAT_CURL_OFF_T ", totally %"
-	CURL_FORMAT_CURL_OFF_T " bytes",
+	DEBUGF(infof(data, "range-download from %" FMT_OFF_T
+	" to %" FMT_OFF_T ", totally %" FMT_OFF_T " bytes",
	from, to, data->req.maxdownload));
	}
	else

lib/curl_setup.h+8 -5

@@ -519,11 +519,11 @@
	#endif

	#if SIZEOF_CURL_SOCKET_T < 8
-	# define CURL_FORMAT_SOCKET_T "d"
+	# define FMT_SOCKET_T "d"
	#elif defined(__MINGW32__)
-	# define CURL_FORMAT_SOCKET_T "zd"
+	# define FMT_SOCKET_T "zd"
	#else
-	# define CURL_FORMAT_SOCKET_T "qd"
+	# define FMT_SOCKET_T "qd"
	#endif

	/*
@@ -571,10 +571,13 @@
	# endif
	# define CURL_UINT64_SUFFIX CURL_SUFFIX_CURL_OFF_TU
	# define CURL_UINT64_C(val) CURL_CONC_MACROS(val,CURL_UINT64_SUFFIX)
-	# define CURL_PRId64 CURL_FORMAT_CURL_OFF_T
-	# define CURL_PRIu64 CURL_FORMAT_CURL_OFF_TU
+	# define FMT_PRId64 CURL_FORMAT_CURL_OFF_T
+	# define FMT_PRIu64 CURL_FORMAT_CURL_OFF_TU
	#endif

+	#define FMT_OFF_T CURL_FORMAT_CURL_OFF_T
+	#define FMT_OFF_TU CURL_FORMAT_CURL_OFF_TU
+
	#if (SIZEOF_TIME_T == 4)
	# ifdef HAVE_TIME_T_UNSIGNED
	# define TIME_T_MAX UINT_MAX

lib/doh.c+2 -2

@@ -218,7 +218,7 @@ static int doh_done(struct Curl_easy *doh, CURLcode result)

	data = Curl_multi_get_handle(doh->multi, doh->set.dohfor_mid);
	if(!data) {
-	DEBUGF(infof(doh, "doh_done: xfer for mid=%" CURL_FORMAT_CURL_OFF_T
+	DEBUGF(infof(doh, "doh_done: xfer for mid=%" FMT_OFF_T
	" not found", doh->set.dohfor_mid));
	DEBUGASSERT(0);
	}
@@ -1437,7 +1437,7 @@ void Curl_doh_close(struct Curl_easy *data)
	probe_data = data->multi? Curl_multi_get_handle(data->multi, mid) : NULL;
	if(!probe_data) {
	DEBUGF(infof(data, "Curl_doh_close: xfer for mid=%"
-	CURL_FORMAT_CURL_OFF_T " not found!",
+	FMT_OFF_T " not found!",
	doh->probe[slot].easy_mid));
	continue;
	}

lib/easy.c+5 -7

@@ -479,14 +479,13 @@ static int events_socket(struct Curl_easy easy, / easy handle */
	else
	ev->list = nxt;
	free(m);
-	infof(easy, "socket cb: socket %" CURL_FORMAT_SOCKET_T
-	" REMOVED", s);
+	infof(easy, "socket cb: socket %" FMT_SOCKET_T " REMOVED", s);
	}
	else {
	/* The socket 's' is already being monitored, update the activity
	mask. Convert from libcurl bitmask to the poll one. */
	m->socket.events = socketcb2poll(what);
-	infof(easy, "socket cb: socket %" CURL_FORMAT_SOCKET_T
+	infof(easy, "socket cb: socket %" FMT_SOCKET_T
	" UPDATED as %s%s", s,
	(what&CURL_POLL_IN)?"IN":"",
	(what&CURL_POLL_OUT)?"OUT":"");
@@ -501,7 +500,7 @@ static int events_socket(struct Curl_easy easy, / easy handle */
	if(what == CURL_POLL_REMOVE) {
	/* should not happen if our logic is correct, but is no drama. */
	DEBUGF(infof(easy, "socket cb: asked to REMOVE socket %"
-	CURL_FORMAT_SOCKET_T "but not present!", s));
+	FMT_SOCKET_T "but not present!", s));
	DEBUGASSERT(0);
	}
	else {
@@ -512,8 +511,7 @@ static int events_socket(struct Curl_easy easy, / easy handle */
	m->socket.events = socketcb2poll(what);
	m->socket.revents = 0;
	ev->list = m;
-	infof(easy, "socket cb: socket %" CURL_FORMAT_SOCKET_T
-	" ADDED as %s%s", s,
+	infof(easy, "socket cb: socket %" FMT_SOCKET_T " ADDED as %s%s", s,
	(what&CURL_POLL_IN)?"IN":"",
	(what&CURL_POLL_OUT)?"OUT":"");
	}
@@ -626,7 +624,7 @@ static CURLcode wait_or_timeout(struct Curl_multi multi, struct events ev)

	/* sending infof "randomly" to the first easy handle */
	infof(data, "call curl_multi_socket_action(socket "
-	"%" CURL_FORMAT_SOCKET_T ")", (curl_socket_t)fds[i].fd);
+	"%" FMT_SOCKET_T ")", (curl_socket_t)fds[i].fd);
	mcode = curl_multi_socket_action(multi, fds[i].fd, act,
	&ev->running_handles);
	}

lib/file.c+1 -2

@@ -468,8 +468,7 @@ static CURLcode file_do(struct Curl_easy data, bool done)
	static const char accept_ranges[]= { "Accept-ranges: bytes\r\n" };
	if(expected_size >= 0) {
	headerlen =
-	msnprintf(header, sizeof(header),
-	"Content-Length: %" CURL_FORMAT_CURL_OFF_T "\r\n",
+	msnprintf(header, sizeof(header), "Content-Length: %" FMT_OFF_T "\r\n",
	expected_size);
	result = Curl_client_write(data, CLIENTWRITE_HEADER, header, headerlen);
	if(result)

lib/ftp.c+14 -16

@@ -2388,8 +2388,8 @@ static CURLcode ftp_state_retr(struct Curl_easy *data,
	if(data->state.resume_from< 0) {
	/* We are supposed to download the last abs(from) bytes */
	if(filesize < -data->state.resume_from) {
-	failf(data, "Offset (%" CURL_FORMAT_CURL_OFF_T
-	") was beyond file size (%" CURL_FORMAT_CURL_OFF_T ")",
+	failf(data, "Offset (%" FMT_OFF_T
+	") was beyond file size (%" FMT_OFF_T ")",
	data->state.resume_from, filesize);
	return CURLE_BAD_DOWNLOAD_RESUME;
	}
@@ -2400,8 +2400,8 @@ static CURLcode ftp_state_retr(struct Curl_easy *data,
	}
	else {
	if(filesize < data->state.resume_from) {
-	failf(data, "Offset (%" CURL_FORMAT_CURL_OFF_T
-	") was beyond file size (%" CURL_FORMAT_CURL_OFF_T ")",
+	failf(data, "Offset (%" FMT_OFF_T
+	") was beyond file size (%" FMT_OFF_T ")",
	data->state.resume_from, filesize);
	return CURLE_BAD_DOWNLOAD_RESUME;
	}
@@ -2423,10 +2423,10 @@ static CURLcode ftp_state_retr(struct Curl_easy *data,
	}

	/* Set resume file transfer offset */
-	infof(data, "Instructs server to resume from offset %"
-	CURL_FORMAT_CURL_OFF_T, data->state.resume_from);
+	infof(data, "Instructs server to resume from offset %" FMT_OFF_T,
+	data->state.resume_from);

-	result = Curl_pp_sendf(data, &ftpc->pp, "REST %" CURL_FORMAT_CURL_OFF_T,
+	result = Curl_pp_sendf(data, &ftpc->pp, "REST %" FMT_OFF_T,
	data->state.resume_from);
	if(!result)
	ftp_state(data, FTP_RETR_REST);
@@ -2484,7 +2484,7 @@ static CURLcode ftp_state_size_resp(struct Curl_easy *data,
	if(-1 != filesize) {
	char clbuf[128];
	int clbuflen = msnprintf(clbuf, sizeof(clbuf),
-	"Content-Length: %" CURL_FORMAT_CURL_OFF_T "\r\n", filesize);
+	"Content-Length: %" FMT_OFF_T "\r\n", filesize);
	result = client_write_header(data, clbuf, clbuflen);
	if(result)
	return result;
@@ -2664,12 +2664,10 @@ static CURLcode ftp_state_get_resp(struct Curl_easy *data,
	else if((instate != FTP_LIST) && (data->state.prefer_ascii))
	size = -1; /* kludge for servers that understate ASCII mode file size */

-	infof(data, "Maxdownload = %" CURL_FORMAT_CURL_OFF_T,
-	data->req.maxdownload);
+	infof(data, "Maxdownload = %" FMT_OFF_T, data->req.maxdownload);

	if(instate != FTP_LIST)
-	infof(data, "Getting file with size: %" CURL_FORMAT_CURL_OFF_T,
-	size);
+	infof(data, "Getting file with size: %" FMT_OFF_T, size);

	/* FTP download: */
	conn->proto.ftpc.state_saved = instate;
@@ -3534,8 +3532,8 @@ static CURLcode ftp_done(struct Curl_easy *data, CURLcode status,
	(data->state.infilesize != data->req.writebytecount) &&
	!data->set.crlf &&
	(ftp->transfer == PPTRANSFER_BODY)) {
-	failf(data, "Uploaded unaligned file size (%" CURL_FORMAT_CURL_OFF_T
-	" out of %" CURL_FORMAT_CURL_OFF_T " bytes)",
+	failf(data, "Uploaded unaligned file size (%" FMT_OFF_T
+	" out of %" FMT_OFF_T " bytes)",
	data->req.writebytecount, data->state.infilesize);
	result = CURLE_PARTIAL_FILE;
	}
@@ -3544,8 +3542,8 @@ static CURLcode ftp_done(struct Curl_easy *data, CURLcode status,
	if((-1 != data->req.size) &&
	(data->req.size != data->req.bytecount) &&
	(data->req.maxdownload != data->req.bytecount)) {
-	failf(data, "Received only partial file: %" CURL_FORMAT_CURL_OFF_T
-	" bytes", data->req.bytecount);
+	failf(data, "Received only partial file: %" FMT_OFF_T " bytes",
+	data->req.bytecount);
	result = CURLE_PARTIAL_FILE;
	}
	else if(!ftpc->dont_check &&

lib/http.c+13 -17

@@ -462,16 +462,15 @@ static CURLcode http_perhapsrewind(struct Curl_easy *data,

	if(abort_upload) {
	if(upload_remain >= 0)
-	infof(data, "%s%sclose instead of sending %"
-	CURL_FORMAT_CURL_OFF_T " more bytes",
-	ongoing_auth? ongoing_auth : "",
-	ongoing_auth? " send, " : "",
-	upload_remain);
+	infof(data, "%s%sclose instead of sending %" FMT_OFF_T " more bytes",
+	ongoing_auth? ongoing_auth : "",
+	ongoing_auth? " send, " : "",
+	upload_remain);
	else
	infof(data, "%s%sclose instead of sending unknown amount "
-	"of more bytes",
-	ongoing_auth? ongoing_auth : "",
-	ongoing_auth? " send, " : "");
+	"of more bytes",
+	ongoing_auth? ongoing_auth : "",
+	ongoing_auth? " send, " : "");
	/* We decided to abort the ongoing transfer */
	streamclose(conn, "Mid-auth HTTP and much data left to send");
	/* FIXME: questionable manipulation here, can we do this differently? */
@@ -2049,7 +2048,7 @@ static CURLcode http_resume(struct Curl_easy *data, Curl_HttpReq httpreq)
	CURLcode result;
	result = Curl_creader_resume_from(data, data->state.resume_from);
	if(result) {
-	failf(data, "Unable to resume from offset %" CURL_FORMAT_CURL_OFF_T,
+	failf(data, "Unable to resume from offset %" FMT_OFF_T,
	data->state.resume_from);
	return result;
	}
@@ -2186,9 +2185,8 @@ CURLcode Curl_http_req_complete(struct Curl_easy *data,
	!Curl_checkheaders(data, STRCONST("Content-Length")))) {
	/* we allow replacing this header if not during auth negotiation,
	although it is not very wise to actually set your own */
-	result = Curl_dyn_addf(r,
-	"Content-Length: %" CURL_FORMAT_CURL_OFF_T
-	"\r\n", req_clen);
+	result = Curl_dyn_addf(r, "Content-Length: %" FMT_OFF_T "\r\n",
+	req_clen);
	}
	if(result)
	goto out;
@@ -2343,8 +2341,7 @@ CURLcode Curl_http_range(struct Curl_easy *data,
	remote part so we tell the server (and act accordingly) that we
	upload the whole file (again) */
	data->state.aptr.rangeline =
-	aprintf("Content-Range: bytes 0-%" CURL_FORMAT_CURL_OFF_T
-	"/%" CURL_FORMAT_CURL_OFF_T "\r\n",
+	aprintf("Content-Range: bytes 0-%" FMT_OFF_T "/%" FMT_OFF_T "\r\n",
	req_clen - 1, req_clen);

	}
@@ -2357,15 +2354,14 @@ CURLcode Curl_http_range(struct Curl_easy *data,
	data->state.infilesize :
	(data->state.resume_from + req_clen);
	data->state.aptr.rangeline =
-	aprintf("Content-Range: bytes %s%" CURL_FORMAT_CURL_OFF_T
-	"/%" CURL_FORMAT_CURL_OFF_T "\r\n",
+	aprintf("Content-Range: bytes %s%" FMT_OFF_T "/%" FMT_OFF_T "\r\n",
	data->state.range, total_len-1, total_len);
	}
	else {
	/* Range was selected and then we just pass the incoming range and
	append total size */
	data->state.aptr.rangeline =
-	aprintf("Content-Range: bytes %s/%" CURL_FORMAT_CURL_OFF_T "\r\n",
+	aprintf("Content-Range: bytes %s/%" FMT_OFF_T "\r\n",
	data->state.range, req_clen);
	}
	if(!data->state.aptr.rangeline)

lib/http2.c+1 -1

@@ -2012,7 +2012,7 @@ static ssize_t cf_h2_recv(struct Curl_cfilter cf, struct Curl_easy data,
	* a read() is called anyway. It is not clear what the calling sequence
	* is for such a case. */
	failf(data, "http/2 recv on a transfer never opened "
-	"or already cleared, mid=%" CURL_FORMAT_CURL_OFF_T, data->mid);
+	"or already cleared, mid=%" FMT_OFF_T, data->mid);
	*err = CURLE_HTTP2;
	return -1;
	}

lib/http_chunks.c+2 -2

@@ -189,7 +189,7 @@ static CURLcode httpchunk_readwrite(struct Curl_easy *data,
	else {
	ch->state = CHUNK_DATA;
	CURL_TRC_WRITE(data, "http_chunked, chunk start of %"
-	CURL_FORMAT_CURL_OFF_T " bytes", ch->datasize);
+	FMT_OFF_T " bytes", ch->datasize);
	}
	}

@@ -226,7 +226,7 @@ static CURLcode httpchunk_readwrite(struct Curl_easy *data,
	buf += piece; /* move read pointer forward */
	blen -= piece; /* decrease space left in this round */
	CURL_TRC_WRITE(data, "http_chunked, write %zu body bytes, %"
-	CURL_FORMAT_CURL_OFF_T " bytes in chunk remain",
+	FMT_OFF_T " bytes in chunk remain",
	piece, ch->datasize);

	if(0 == ch->datasize)

lib/imap.c+3 -5

@@ -814,8 +814,7 @@ static CURLcode imap_perform_append(struct Curl_easy *data)
	return CURLE_OUT_OF_MEMORY;

	/* Send the APPEND command */
-	result = imap_sendf(data,
-	"APPEND %s (\\Seen) {%" CURL_FORMAT_CURL_OFF_T "}",
+	result = imap_sendf(data, "APPEND %s (\\Seen) {%" FMT_OFF_T "}",
	mailbox, data->state.infilesize);

	free(mailbox);
@@ -1168,8 +1167,7 @@ static CURLcode imap_state_fetch_resp(struct Curl_easy *data,
	}

	if(parsed) {
-	infof(data, "Found %" CURL_FORMAT_CURL_OFF_T " bytes to download",
-	size);
+	infof(data, "Found %" FMT_OFF_T " bytes to download", size);
	Curl_pgrsSetDownloadSize(data, size);

	if(pp->overflow) {
@@ -1196,7 +1194,7 @@ static CURLcode imap_state_fetch_resp(struct Curl_easy *data,
	if(result)
	return result;

-	infof(data, "Written %zu bytes, %" CURL_FORMAT_CURL_OFF_TU
+	infof(data, "Written %zu bytes, %" FMT_OFF_TU
	" bytes are left for transfer", chunk, size - chunk);

	/* Have we used the entire overflow or just part of it?*/

lib/memdebug.c+5 -5

@@ -312,7 +312,7 @@ curl_socket_t curl_dbg_socket(int domain, int type, int protocol,
	sockfd = socket(domain, type, protocol);

	if(source && (sockfd != CURL_SOCKET_BAD))
-	curl_dbg_log("FD %s:%d socket() = %" CURL_FORMAT_SOCKET_T "\n",
+	curl_dbg_log("FD %s:%d socket() = %" FMT_SOCKET_T "\n",
	source, line, sockfd);

	return sockfd;
@@ -356,8 +356,8 @@ int curl_dbg_socketpair(int domain, int type, int protocol,

	if(source && (0 == res))
	curl_dbg_log("FD %s:%d socketpair() = "
-	"%" CURL_FORMAT_SOCKET_T " %" CURL_FORMAT_SOCKET_T "\n",
-	source, line, socket_vector[0], socket_vector[1]);
+	"%" FMT_SOCKET_T " %" FMT_SOCKET_T "\n",
+	source, line, socket_vector[0], socket_vector[1]);

	return res;
	}
@@ -372,7 +372,7 @@ curl_socket_t curl_dbg_accept(curl_socket_t s, void saddr, void saddrlen,
	curl_socket_t sockfd = accept(s, addr, addrlen);

	if(source && (sockfd != CURL_SOCKET_BAD))
-	curl_dbg_log("FD %s:%d accept() = %" CURL_FORMAT_SOCKET_T "\n",
+	curl_dbg_log("FD %s:%d accept() = %" FMT_SOCKET_T "\n",
	source, line, sockfd);

	return sockfd;
@@ -382,7 +382,7 @@ curl_socket_t curl_dbg_accept(curl_socket_t s, void saddr, void saddrlen,
	void curl_dbg_mark_sclose(curl_socket_t sockfd, int line, const char *source)
	{
	if(source)
-	curl_dbg_log("FD %s:%d sclose(%" CURL_FORMAT_SOCKET_T ")\n",
+	curl_dbg_log("FD %s:%d sclose(%" FMT_SOCKET_T ")\n",
	source, line, sockfd);
	}

lib/mime.c+4 -4

@@ -1989,7 +1989,7 @@ static CURLcode cr_mime_read(struct Curl_easy *data,
	case 0:
	if((ctx->total_len >= 0) && (ctx->read_len < ctx->total_len)) {
	failf(data, "client mime read EOF fail, "
-	"only %"CURL_FORMAT_CURL_OFF_T"/%"CURL_FORMAT_CURL_OFF_T
+	"only %"FMT_OFF_T"/%"FMT_OFF_T
	" of needed bytes read", ctx->read_len, ctx->total_len);
	return CURLE_READ_ERROR;
	}
@@ -2042,8 +2042,8 @@ static CURLcode cr_mime_read(struct Curl_easy *data,
	}

	out:
-	CURL_TRC_READ(data, "cr_mime_read(len=%zu, total=%" CURL_FORMAT_CURL_OFF_T
-	", read=%"CURL_FORMAT_CURL_OFF_T") -> %d, %zu, %d",
+	CURL_TRC_READ(data, "cr_mime_read(len=%zu, total=%" FMT_OFF_T
+	", read=%"FMT_OFF_T") -> %d, %zu, %d",
	blen, ctx->total_len, ctx->read_len, CURLE_OK, pnread, peos);
	return CURLE_OK;
	}
@@ -2086,7 +2086,7 @@ static CURLcode cr_mime_resume_from(struct Curl_easy *data,
	if((nread == 0) \|\| (nread > readthisamountnow)) {
	/* this checks for greater-than only to make sure that the
	CURL_READFUNC_ABORT return code still aborts */
-	failf(data, "Could only read %" CURL_FORMAT_CURL_OFF_T
+	failf(data, "Could only read %" FMT_OFF_T
	" bytes from the mime post", passed);
	return CURLE_READ_ERROR;
	}

lib/multi.c+16 -16

@@ -647,8 +647,8 @@ static void multi_done_locked(struct connectdata *conn,
	) \|\| conn->bits.close
	\|\| (mdctx->premature && !Curl_conn_is_multiplex(conn, FIRSTSOCKET))) {
	DEBUGF(infof(data, "multi_done, not reusing connection=%"
-	CURL_FORMAT_CURL_OFF_T ", forbid=%d"
-	", close=%d, premature=%d, conn_multiplex=%d",
+	FMT_OFF_T ", forbid=%d"
+	", close=%d, premature=%d, conn_multiplex=%d",
	conn->connection_id, data->set.reuse_forbid,
	conn->bits.close, mdctx->premature,
	Curl_conn_is_multiplex(conn, FIRSTSOCKET)));
@@ -668,8 +668,8 @@ static void multi_done_locked(struct connectdata *conn,
	conn->bits.conn_to_host ? conn->conn_to_host.dispname :
	conn->host.dispname;
	data->state.lastconnect_id = conn->connection_id;
-	infof(data, "Connection #%" CURL_FORMAT_CURL_OFF_T
-	" to host %s left intact", conn->connection_id, host);
+	infof(data, "Connection #%" FMT_OFF_T " to host %s left intact",
+	conn->connection_id, host);
	}
	else {
	/* connection was removed from the cpool and destroyed. */
@@ -1669,23 +1669,23 @@ static bool multi_handle_timeout(struct Curl_easy *data,
	else
	since = data->progress.t_startop;
	if(data->mstate == MSTATE_RESOLVING)
-	failf(data, "Resolving timed out after %" CURL_FORMAT_TIMEDIFF_T
+	failf(data, "Resolving timed out after %" FMT_TIMEDIFF_T
	" milliseconds", Curl_timediff(*now, since));
	else if(data->mstate == MSTATE_CONNECTING)
-	failf(data, "Connection timed out after %" CURL_FORMAT_TIMEDIFF_T
+	failf(data, "Connection timed out after %" FMT_TIMEDIFF_T
	" milliseconds", Curl_timediff(*now, since));
	else {
	struct SingleRequest *k = &data->req;
	if(k->size != -1) {
-	failf(data, "Operation timed out after %" CURL_FORMAT_TIMEDIFF_T
-	" milliseconds with %" CURL_FORMAT_CURL_OFF_T " out of %"
-	CURL_FORMAT_CURL_OFF_T " bytes received",
+	failf(data, "Operation timed out after %" FMT_TIMEDIFF_T
+	" milliseconds with %" FMT_OFF_T " out of %"
+	FMT_OFF_T " bytes received",
	Curl_timediff(*now, since), k->bytecount, k->size);
	}
	else {
-	failf(data, "Operation timed out after %" CURL_FORMAT_TIMEDIFF_T
-	" milliseconds with %" CURL_FORMAT_CURL_OFF_T
-	" bytes received", Curl_timediff(*now, since), k->bytecount);
+	failf(data, "Operation timed out after %" FMT_TIMEDIFF_T
+	" milliseconds with %" FMT_OFF_T " bytes received",
+	Curl_timediff(*now, since), k->bytecount);
	}
	}
	*result = CURLE_OPERATION_TIMEDOUT;
@@ -3019,15 +3019,15 @@ void Curl_multi_closed(struct Curl_easy *data, curl_socket_t s)
	if(data) {
	/* if there is still an easy handle associated with this connection */
	struct Curl_multi *multi = data->multi;
-	DEBUGF(infof(data, "Curl_multi_closed, fd=%" CURL_FORMAT_SOCKET_T
-	" multi is %p", s, (void *)multi));
+	DEBUGF(infof(data, "Curl_multi_closed, fd=%" FMT_SOCKET_T
+	" multi is %p", s, (void *)multi));
	if(multi) {
	/* this is set if this connection is part of a handle that is added to
	a multi handle, and only then this is necessary */
	struct Curl_sh_entry *entry = sh_getentry(&multi->sockhash, s);

-	DEBUGF(infof(data, "Curl_multi_closed, fd=%" CURL_FORMAT_SOCKET_T
-	" entry is %p", s, (void *)entry));
+	DEBUGF(infof(data, "Curl_multi_closed, fd=%" FMT_SOCKET_T
+	" entry is %p", s, (void *)entry));
	if(entry) {
	int rc = 0;
	if(multi->socket_cb) {

lib/progress.c+18 -20

@@ -48,8 +48,7 @@ static void time2str(char *r, curl_off_t seconds)
	if(h <= CURL_OFF_T_C(99)) {
	curl_off_t m = (seconds - (h*CURL_OFF_T_C(3600))) / CURL_OFF_T_C(60);
	curl_off_t s = (seconds - (hCURL_OFF_T_C(3600))) - (mCURL_OFF_T_C(60));
-	msnprintf(r, 9, "%2" CURL_FORMAT_CURL_OFF_T ":%02" CURL_FORMAT_CURL_OFF_T
-	":%02" CURL_FORMAT_CURL_OFF_T, h, m, s);
+	msnprintf(r, 9, "%2" FMT_OFF_T ":%02" FMT_OFF_T ":%02" FMT_OFF_T, h, m, s);
	}
	else {
	/* this equals to more than 99 hours, switch to a more suitable output
@@ -57,10 +56,9 @@ static void time2str(char *r, curl_off_t seconds)
	curl_off_t d = seconds / CURL_OFF_T_C(86400);
	h = (seconds - (d*CURL_OFF_T_C(86400))) / CURL_OFF_T_C(3600);
	if(d <= CURL_OFF_T_C(999))
-	msnprintf(r, 9, "%3" CURL_FORMAT_CURL_OFF_T
-	"d %02" CURL_FORMAT_CURL_OFF_T "h", d, h);
+	msnprintf(r, 9, "%3" FMT_OFF_T "d %02" FMT_OFF_T "h", d, h);
	else
-	msnprintf(r, 9, "%7" CURL_FORMAT_CURL_OFF_T "d", d);
+	msnprintf(r, 9, "%7" FMT_OFF_T "d", d);
	}
	}

@@ -76,38 +74,38 @@ static char max5data(curl_off_t bytes, char max5)
	#define ONE_PETABYTE (CURL_OFF_T_C(1024) * ONE_TERABYTE)

	if(bytes < CURL_OFF_T_C(100000))
-	msnprintf(max5, 6, "%5" CURL_FORMAT_CURL_OFF_T, bytes);
+	msnprintf(max5, 6, "%5" FMT_OFF_T, bytes);

	else if(bytes < CURL_OFF_T_C(10000) * ONE_KILOBYTE)
-	msnprintf(max5, 6, "%4" CURL_FORMAT_CURL_OFF_T "k", bytes/ONE_KILOBYTE);
+	msnprintf(max5, 6, "%4" FMT_OFF_T "k", bytes/ONE_KILOBYTE);

	else if(bytes < CURL_OFF_T_C(100) * ONE_MEGABYTE)
	/* 'XX.XM' is good as long as we are less than 100 megs */
-	msnprintf(max5, 6, "%2" CURL_FORMAT_CURL_OFF_T ".%0"
-	CURL_FORMAT_CURL_OFF_T "M", bytes/ONE_MEGABYTE,
+	msnprintf(max5, 6, "%2" FMT_OFF_T ".%0"
+	FMT_OFF_T "M", bytes/ONE_MEGABYTE,
	(bytes%ONE_MEGABYTE) / (ONE_MEGABYTE/CURL_OFF_T_C(10)) );

	else if(bytes < CURL_OFF_T_C(10000) * ONE_MEGABYTE)
	/* 'XXXXM' is good until we are at 10000MB or above */
-	msnprintf(max5, 6, "%4" CURL_FORMAT_CURL_OFF_T "M", bytes/ONE_MEGABYTE);
+	msnprintf(max5, 6, "%4" FMT_OFF_T "M", bytes/ONE_MEGABYTE);

	else if(bytes < CURL_OFF_T_C(100) * ONE_GIGABYTE)
	/* 10000 MB - 100 GB, we show it as XX.XG */
-	msnprintf(max5, 6, "%2" CURL_FORMAT_CURL_OFF_T ".%0"
-	CURL_FORMAT_CURL_OFF_T "G", bytes/ONE_GIGABYTE,
+	msnprintf(max5, 6, "%2" FMT_OFF_T ".%0"
+	FMT_OFF_T "G", bytes/ONE_GIGABYTE,
	(bytes%ONE_GIGABYTE) / (ONE_GIGABYTE/CURL_OFF_T_C(10)) );

	else if(bytes < CURL_OFF_T_C(10000) * ONE_GIGABYTE)
	/* up to 10000GB, display without decimal: XXXXG */
-	msnprintf(max5, 6, "%4" CURL_FORMAT_CURL_OFF_T "G", bytes/ONE_GIGABYTE);
+	msnprintf(max5, 6, "%4" FMT_OFF_T "G", bytes/ONE_GIGABYTE);

	else if(bytes < CURL_OFF_T_C(10000) * ONE_TERABYTE)
	/* up to 10000TB, display without decimal: XXXXT */
-	msnprintf(max5, 6, "%4" CURL_FORMAT_CURL_OFF_T "T", bytes/ONE_TERABYTE);
+	msnprintf(max5, 6, "%4" FMT_OFF_T "T", bytes/ONE_TERABYTE);

	else
	/* up to 10000PB, display without decimal: XXXXP */
-	msnprintf(max5, 6, "%4" CURL_FORMAT_CURL_OFF_T "P", bytes/ONE_PETABYTE);
+	msnprintf(max5, 6, "%4" FMT_OFF_T "P", bytes/ONE_PETABYTE);

	/* 16384 petabytes (16 exabytes) is the maximum a 64-bit unsigned number can
	hold, but our data type is signed so 8192PB will be the maximum. */
@@ -514,8 +512,8 @@ static void progress_meter(struct Curl_easy *data)
	if(!(p->flags & PGRS_HEADERS_OUT)) {
	if(data->state.resume_from) {
	fprintf(data->set.err,
-	"** Resuming transfer from byte position %"
-	CURL_FORMAT_CURL_OFF_T "\n", data->state.resume_from);
+	"** Resuming transfer from byte position %" FMT_OFF_T "\n",
+	data->state.resume_from);
	}
	fprintf(data->set.err,
	" %% Total %% Received %% Xferd Average Speed "
@@ -549,9 +547,9 @@ static void progress_meter(struct Curl_easy *data)

	fprintf(data->set.err,
	"\r"
-	"%3" CURL_FORMAT_CURL_OFF_T " %s "
-	"%3" CURL_FORMAT_CURL_OFF_T " %s "
-	"%3" CURL_FORMAT_CURL_OFF_T " %s %s %s %s %s %s %s",
+	"%3" FMT_OFF_T " %s "
+	"%3" FMT_OFF_T " %s "
+	"%3" FMT_OFF_T " %s %s %s %s %s %s %s",
	total_estm.percent, /* 3 letters / / total % */
	max5data(total_expected_size, max5[2]), /* total size */
	dl_estm.percent, /* 3 letters / / rcvd % */

lib/request.c+4 -4

@@ -264,14 +264,14 @@ CURLcode Curl_req_set_upload_done(struct Curl_easy *data)
	if(data->req.upload_aborted) {
	Curl_bufq_reset(&data->req.sendbuf);
	if(data->req.writebytecount)
-	infof(data, "abort upload after having sent %" CURL_FORMAT_CURL_OFF_T
-	" bytes", data->req.writebytecount);
+	infof(data, "abort upload after having sent %" FMT_OFF_T " bytes",
+	data->req.writebytecount);
	else
	infof(data, "abort upload");
	}
	else if(data->req.writebytecount)
-	infof(data, "upload completely sent off: %" CURL_FORMAT_CURL_OFF_T
-	" bytes", data->req.writebytecount);
+	infof(data, "upload completely sent off: %" FMT_OFF_T " bytes",
+	data->req.writebytecount);
	else if(!data->req.download_done) {
	DEBUGASSERT(Curl_bufq_is_empty(&data->req.sendbuf));
	infof(data, Curl_creader_total_length(data)?

lib/rtsp.c+2 -3

@@ -533,8 +533,7 @@ static CURLcode rtsp_do(struct Curl_easy data, bool done)
	* actually set a custom Content-Length in the headers */
	if(!Curl_checkheaders(data, STRCONST("Content-Length"))) {
	result =
-	Curl_dyn_addf(&req_buffer,
-	"Content-Length: %" CURL_FORMAT_CURL_OFF_T"\r\n",
+	Curl_dyn_addf(&req_buffer, "Content-Length: %" FMT_OFF_T"\r\n",
	req_clen);
	if(result)
	goto out;
@@ -854,7 +853,7 @@ static CURLcode rtsp_rtp_write_resp(struct Curl_easy *data,
	* In which case we write out the left over bytes, letting the client
	* writer deal with it (it will report EXCESS and fail the transfer). */
	DEBUGF(infof(data, "rtsp_rtp_write_resp(len=%zu, in_header=%d, done=%d "
-	" rtspc->state=%d, req.size=%" CURL_FORMAT_CURL_OFF_T ")",
+	" rtspc->state=%d, req.size=%" FMT_OFF_T ")",
	blen, rtspc->in_header, data->req.done, rtspc->state,
	data->req.size));
	if(!result && (is_eos \|\| blen)) {

lib/sendf.c+14 -15

@@ -292,8 +292,8 @@ static CURLcode cw_download_write(struct Curl_easy *data,

	if((type & CLIENTWRITE_EOS) && !data->req.no_body &&
	(data->req.maxdownload > data->req.bytecount)) {
-	failf(data, "end of response with %" CURL_FORMAT_CURL_OFF_T
-	" bytes missing", data->req.maxdownload - data->req.bytecount);
+	failf(data, "end of response with %" FMT_OFF_T " bytes missing",
+	data->req.maxdownload - data->req.bytecount);
	return CURLE_PARTIAL_FILE;
	}
	}
@@ -328,9 +328,9 @@ static CURLcode cw_download_write(struct Curl_easy *data,
	infof(data,
	"Excess found writing body:"
	" excess = %zu"
-	", size = %" CURL_FORMAT_CURL_OFF_T
-	", maxdownload = %" CURL_FORMAT_CURL_OFF_T
-	", bytecount = %" CURL_FORMAT_CURL_OFF_T,
+	", size = %" FMT_OFF_T
+	", maxdownload = %" FMT_OFF_T
+	", bytecount = %" FMT_OFF_T,
	excess_len, data->req.size, data->req.maxdownload,
	data->req.bytecount);
	connclose(data->conn, "excess found in a read");
@@ -338,8 +338,7 @@ static CURLcode cw_download_write(struct Curl_easy *data,
	}
	else if(nwrite < nbytes) {
	failf(data, "Exceeded the maximum allowed file size "
-	"(%" CURL_FORMAT_CURL_OFF_T ") with %"
-	CURL_FORMAT_CURL_OFF_T " bytes",
+	"(%" FMT_OFF_T ") with %" FMT_OFF_T " bytes",
	data->set.max_filesize, data->req.bytecount);
	return CURLE_FILESIZE_EXCEEDED;
	}
@@ -688,8 +687,8 @@ static CURLcode cr_in_read(struct Curl_easy *data,
	case 0:
	if((ctx->total_len >= 0) && (ctx->read_len < ctx->total_len)) {
	failf(data, "client read function EOF fail, "
-	"only %"CURL_FORMAT_CURL_OFF_T"/%"CURL_FORMAT_CURL_OFF_T
-	" of needed bytes read", ctx->read_len, ctx->total_len);
+	"only %"FMT_OFF_T"/%"FMT_OFF_T " of needed bytes read",
+	ctx->read_len, ctx->total_len);
	return CURLE_READ_ERROR;
	}
	*pnread = 0;
@@ -738,8 +737,8 @@ static CURLcode cr_in_read(struct Curl_easy *data,
	*peos = ctx->seen_eos;
	break;
	}
-	CURL_TRC_READ(data, "cr_in_read(len=%zu, total=%"CURL_FORMAT_CURL_OFF_T
-	", read=%"CURL_FORMAT_CURL_OFF_T") -> %d, nread=%zu, eos=%d",
+	CURL_TRC_READ(data, "cr_in_read(len=%zu, total=%"FMT_OFF_T
+	", read=%"FMT_OFF_T") -> %d, nread=%zu, eos=%d",
	blen, ctx->total_len, ctx->read_len, CURLE_OK,
	pnread, peos);
	return CURLE_OK;
@@ -804,8 +803,8 @@ static CURLcode cr_in_resume_from(struct Curl_easy *data,
	if((actuallyread == 0) \|\| (actuallyread > readthisamountnow)) {
	/* this checks for greater-than only to make sure that the
	CURL_READFUNC_ABORT return code still aborts */
-	failf(data, "Could only read %" CURL_FORMAT_CURL_OFF_T
-	" bytes from the input", passed);
+	failf(data, "Could only read %" FMT_OFF_T " bytes from the input",
+	passed);
	return CURLE_READ_ERROR;
	}
	} while(passed < offset);
@@ -1126,8 +1125,8 @@ CURLcode Curl_creader_set_fread(struct Curl_easy *data, curl_off_t len)
	cl_reset_reader(data);
	result = do_init_reader_stack(data, r);
	out:
-	CURL_TRC_READ(data, "add fread reader, len=%"CURL_FORMAT_CURL_OFF_T
-	" -> %d", len, result);
+	CURL_TRC_READ(data, "add fread reader, len=%"FMT_OFF_T " -> %d",
+	len, result);
	return result;
	}

lib/smtp.c+1 -1

@@ -723,7 +723,7 @@ static CURLcode smtp_perform_mail(struct Curl_easy *data)

	/* Calculate the optional SIZE parameter */
	if(conn->proto.smtpc.size_supported && data->state.infilesize > 0) {
-	size = aprintf("%" CURL_FORMAT_CURL_OFF_T, data->state.infilesize);
+	size = aprintf("%" FMT_OFF_T, data->state.infilesize);

	if(!size) {
	result = CURLE_OUT_OF_MEMORY;

lib/tftp.c+2 -3

@@ -240,8 +240,7 @@ static CURLcode tftp_set_timeouts(struct tftp_state_data *state)
	state->retry_time = 1;

	infof(state->data,
-	"set timeouts for state %d; Total % " CURL_FORMAT_CURL_OFF_T
-	", retry %d maxtry %d",
+	"set timeouts for state %d; Total % " FMT_OFF_T ", retry %d maxtry %d",
	(int)state->state, timeout_ms, state->retry_time, state->retry_max);

	/* init RX time */
@@ -484,7 +483,7 @@ static CURLcode tftp_send_first(struct tftp_state_data *state,
	char buf[64];
	/* add tsize option */
	if(data->state.upload && (data->state.infilesize != -1))
-	msnprintf(buf, sizeof(buf), "%" CURL_FORMAT_CURL_OFF_T,
+	msnprintf(buf, sizeof(buf), "%" FMT_OFF_T,
	data->state.infilesize);
	else
	strcpy(buf, "0"); /* the destination is large enough */

lib/timediff.h+1 -1

@@ -29,7 +29,7 @@
	/* Use a larger type even for 32-bit time_t systems so that we can keep
	microsecond accuracy in it */
	typedef curl_off_t timediff_t;
-	#define CURL_FORMAT_TIMEDIFF_T CURL_FORMAT_CURL_OFF_T
+	#define FMT_TIMEDIFF_T FMT_OFF_T

	#define TIMEDIFF_T_MAX CURL_OFF_T_MAX
	#define TIMEDIFF_T_MIN CURL_OFF_T_MIN

lib/transfer.c+6 -6

@@ -496,15 +496,15 @@ CURLcode Curl_sendrecv(struct Curl_easy data, struct curltime nowp)
	if(k->keepon) {
	if(0 > Curl_timeleft(data, nowp, FALSE)) {
	if(k->size != -1) {
-	failf(data, "Operation timed out after %" CURL_FORMAT_TIMEDIFF_T
-	" milliseconds with %" CURL_FORMAT_CURL_OFF_T " out of %"
-	CURL_FORMAT_CURL_OFF_T " bytes received",
+	failf(data, "Operation timed out after %" FMT_TIMEDIFF_T
+	" milliseconds with %" FMT_OFF_T " out of %"
+	FMT_OFF_T " bytes received",
	Curl_timediff(*nowp, data->progress.t_startsingle),
	k->bytecount, k->size);
	}
	else {
-	failf(data, "Operation timed out after %" CURL_FORMAT_TIMEDIFF_T
-	" milliseconds with %" CURL_FORMAT_CURL_OFF_T " bytes received",
+	failf(data, "Operation timed out after %" FMT_TIMEDIFF_T
+	" milliseconds with %" FMT_OFF_T " bytes received",
	Curl_timediff(*nowp, data->progress.t_startsingle),
	k->bytecount);
	}
@@ -519,7 +519,7 @@ CURLcode Curl_sendrecv(struct Curl_easy data, struct curltime nowp)
	*/
	if(!(data->req.no_body) && (k->size != -1) &&
	(k->bytecount != k->size) && !k->newurl) {
-	failf(data, "transfer closed with %" CURL_FORMAT_CURL_OFF_T
+	failf(data, "transfer closed with %" FMT_OFF_T
	" bytes remaining to read", k->size - k->bytecount);
	result = CURLE_PARTIAL_FILE;
	goto out;

lib/url.c+9 -10

@@ -629,8 +629,7 @@ bool Curl_on_disconnect(struct Curl_easy *data,
	/* the transfer must be detached from the connection */
	DEBUGASSERT(!data->conn);

-	DEBUGF(infof(data, "Curl_disconnect(conn #%"
-	CURL_FORMAT_CURL_OFF_T ", aborted=%d)",
+	DEBUGF(infof(data, "Curl_disconnect(conn #%" FMT_OFF_T ", aborted=%d)",
	conn->connection_id, aborted));

	if(conn->dns_entry)
@@ -721,7 +720,7 @@ static bool conn_maxage(struct Curl_easy *data,
	idletime /= 1000; /* integer seconds is fine */

	if(idletime > data->set.maxage_conn) {
-	infof(data, "Too old connection (%" CURL_FORMAT_TIMEDIFF_T
+	infof(data, "Too old connection (%" FMT_TIMEDIFF_T
	" seconds idle), disconnect it", idletime);
	return TRUE;
	}
@@ -731,7 +730,7 @@ static bool conn_maxage(struct Curl_easy *data,

	if(data->set.maxlifetime_conn && lifetime > data->set.maxlifetime_conn) {
	infof(data,
-	"Too old connection (%" CURL_FORMAT_TIMEDIFF_T
+	"Too old connection (%" FMT_TIMEDIFF_T
	" seconds since creation), disconnect it", lifetime);
	return TRUE;
	}
@@ -799,7 +798,7 @@ bool Curl_conn_seems_dead(struct connectdata *conn,

	if(dead) {
	/* remove connection from cpool */
-	infof(data, "Connection %" CURL_FORMAT_CURL_OFF_T " seems to be dead",
+	infof(data, "Connection %" FMT_OFF_T " seems to be dead",
	conn->connection_id);
	return TRUE;
	}
@@ -914,7 +913,7 @@ static bool url_match_conn(struct connectdata conn, void userdata)
	if(match->may_multiplex) {
	match->seen_pending_conn = TRUE;
	/* Do not pick a connection that has not connected yet */
-	infof(data, "Connection #%" CURL_FORMAT_CURL_OFF_T
+	infof(data, "Connection #%" FMT_OFF_T
	" is not open enough, cannot reuse", conn->connection_id);
	}
	/* Do not pick a connection that has not connected yet */
@@ -989,7 +988,7 @@ static bool url_match_conn(struct connectdata conn, void userdata)
	/* match SSL config to proxy */
	if(!Curl_ssl_conn_config_match(data, conn, TRUE)) {
	DEBUGF(infof(data,
-	"Connection #%" CURL_FORMAT_CURL_OFF_T
+	"Connection #%" FMT_OFF_T
	" has different SSL proxy parameters, cannot reuse",
	conn->connection_id));
	return FALSE;
@@ -1088,7 +1087,7 @@ static bool url_match_conn(struct connectdata conn, void userdata)
	if((needle->handler->flags & PROTOPT_SSL) &&
	!Curl_ssl_conn_config_match(data, conn, FALSE)) {
	DEBUGF(infof(data,
-	"Connection #%" CURL_FORMAT_CURL_OFF_T
+	"Connection #%" FMT_OFF_T
	" has different SSL parameters, cannot reuse",
	conn->connection_id));
	return FALSE;
@@ -1931,7 +1930,7 @@ static CURLcode setup_range(struct Curl_easy *data)
	free(s->range);

	if(s->resume_from)
-	s->range = aprintf("%" CURL_FORMAT_CURL_OFF_T "-", s->resume_from);
+	s->range = aprintf("%" FMT_OFF_T "-", s->resume_from);
	else
	s->range = strdup(data->set.str[STRING_SET_RANGE]);

@@ -3159,7 +3158,7 @@ static CURLcode resolve_server(struct Curl_easy *data,
	*async = TRUE;
	else if(rc == CURLRESOLV_TIMEDOUT) {
	failf(data, "Failed to resolve %s '%s' with timeout after %"
-	CURL_FORMAT_TIMEDIFF_T " ms", peertype, ehost->dispname,
+	FMT_TIMEDIFF_T " ms", peertype, ehost->dispname,
	Curl_timediff(Curl_now(), data->progress.t_startsingle));
	return CURLE_OPERATION_TIMEDOUT;
	}

lib/vquic/curl_ngtcp2.c+39 -42

@@ -268,7 +268,7 @@ static void cf_ngtcp2_stream_close(struct Curl_cfilter *cf,
	NGHTTP3_H3_REQUEST_CANCELLED);
	result = cf_progress_egress(cf, data, NULL);
	if(result)
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] cancel stream -> %d",
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] cancel stream -> %d",
	stream->id, result);
	}
	}
@@ -279,7 +279,7 @@ static void h3_data_done(struct Curl_cfilter cf, struct Curl_easy data)
	struct h3_stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	(void)cf;
	if(stream) {
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] easy handle is done",
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] easy handle is done",
	stream->id);
	cf_ngtcp2_stream_close(cf, data, stream);
	Curl_hash_offt_remove(&ctx->streams, data->mid);
@@ -518,12 +518,12 @@ static int cb_recv_stream_data(ngtcp2_conn *tconn, uint32_t flags,
	if(!data)
	data = CF_DATA_CURRENT(cf);
	if(data)
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] read_stream(len=%zu) -> %zd",
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] read_stream(len=%zu) -> %zd",
	stream_id, buflen, nconsumed);
	if(nconsumed < 0) {
	struct h3_stream_ctx *stream = H3_STREAM_CTX_ID(ctx, stream_id);
	if(data && stream) {
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] error on known stream, "
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] error on known stream, "
	"reset=%d, closed=%d",
	stream_id, stream->reset, stream->closed);
	}
@@ -583,8 +583,8 @@ static int cb_stream_close(ngtcp2_conn *tconn, uint32_t flags,
	}

	rv = nghttp3_conn_close_stream(ctx->h3conn, stream_id, app_error_code);
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] quic close(app_error=%"
-	CURL_PRIu64 ") -> %d", stream_id, (curl_uint64_t)app_error_code,
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] quic close(app_error=%"
+	FMT_PRIu64 ") -> %d", stream_id, (curl_uint64_t)app_error_code,
	rv);
	if(rv && rv != NGHTTP3_ERR_STREAM_NOT_FOUND) {
	cf_ngtcp2_h3_err_set(cf, data, rv);
@@ -609,7 +609,7 @@ static int cb_stream_reset(ngtcp2_conn *tconn, int64_t sid,
	(void)data;

	rv = nghttp3_conn_shutdown_stream_read(ctx->h3conn, stream_id);
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] reset -> %d", stream_id, rv);
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] reset -> %d", stream_id, rv);
	if(rv && rv != NGHTTP3_ERR_STREAM_NOT_FOUND) {
	return NGTCP2_ERR_CALLBACK_FAILURE;
	}
@@ -647,8 +647,8 @@ static int cb_extend_max_local_streams_bidi(ngtcp2_conn *tconn,
	(void)tconn;
	ctx->max_bidi_streams = max_streams;
	if(data)
-	CURL_TRC_CF(data, cf, "max bidi streams now %" CURL_PRIu64
-	", used %" CURL_PRIu64, (curl_uint64_t)ctx->max_bidi_streams,
+	CURL_TRC_CF(data, cf, "max bidi streams now %" FMT_PRIu64
+	", used %" FMT_PRIu64, (curl_uint64_t)ctx->max_bidi_streams,
	(curl_uint64_t)ctx->used_bidi_streams);
	return 0;
	}
@@ -674,8 +674,7 @@ static int cb_extend_max_stream_data(ngtcp2_conn *tconn, int64_t sid,
	}
	s_data = get_stream_easy(cf, data, stream_id, &stream);
	if(s_data && stream && stream->quic_flow_blocked) {
-	CURL_TRC_CF(s_data, cf, "[%" CURL_PRId64 "] unblock quic flow",
-	stream_id);
+	CURL_TRC_CF(s_data, cf, "[%" FMT_PRId64 "] unblock quic flow", stream_id);
	stream->quic_flow_blocked = FALSE;
	h3_drain_stream(cf, s_data);
	}
@@ -895,11 +894,11 @@ static int cb_h3_stream_close(nghttp3_conn *conn, int64_t sid,
	if(stream->error3 != NGHTTP3_H3_NO_ERROR) {
	stream->reset = TRUE;
	stream->send_closed = TRUE;
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] RESET: error %" CURL_PRIu64,
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] RESET: error %" FMT_PRIu64,
	stream->id, stream->error3);
	}
	else {
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] CLOSED", stream->id);
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] CLOSED", stream->id);
	}
	h3_drain_stream(cf, data);
	return 0;
@@ -915,7 +914,7 @@ static void h3_xfer_write_resp_hd(struct Curl_cfilter *cf,
	if(!stream->xfer_result) {
	stream->xfer_result = Curl_xfer_write_resp_hd(data, buf, blen, eos);
	if(stream->xfer_result)
-	CURL_TRC_CF(data, cf, "[%"CURL_PRId64"] error %d writing %zu "
+	CURL_TRC_CF(data, cf, "[%"FMT_PRId64"] error %d writing %zu "
	"bytes of headers", stream->id, stream->xfer_result, blen);
	}
	}
@@ -931,7 +930,7 @@ static void h3_xfer_write_resp(struct Curl_cfilter *cf,
	stream->xfer_result = Curl_xfer_write_resp(data, buf, blen, eos);
	/* If the transfer write is errored, we do not want any more data */
	if(stream->xfer_result) {
-	CURL_TRC_CF(data, cf, "[%"CURL_PRId64"] error %d writing %zu bytes "
+	CURL_TRC_CF(data, cf, "[%"FMT_PRId64"] error %d writing %zu bytes "
	"of data", stream->id, stream->xfer_result, blen);
	}
	}
@@ -954,12 +953,12 @@ static int cb_h3_recv_data(nghttp3_conn *conn, int64_t stream3_id,

	h3_xfer_write_resp(cf, data, stream, (char *)buf, blen, FALSE);
	if(blen) {
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] ACK %zu bytes of DATA",
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] ACK %zu bytes of DATA",
	stream->id, blen);
	ngtcp2_conn_extend_max_stream_offset(ctx->qconn, stream->id, blen);
	ngtcp2_conn_extend_max_offset(ctx->qconn, blen);
	}
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] DATA len=%zu", stream->id, blen);
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] DATA len=%zu", stream->id, blen);
	return 0;
	}

@@ -997,7 +996,7 @@ static int cb_h3_end_headers(nghttp3_conn *conn, int64_t sid,
	/* add a CRLF only if we have received some headers */
	h3_xfer_write_resp_hd(cf, data, stream, STRCONST("\r\n"), stream->closed);

-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] end_headers, status=%d",
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] end_headers, status=%d",
	stream_id, stream->status_code);
	if(stream->status_code / 100 != 1) {
	stream->resp_hds_complete = TRUE;
@@ -1045,7 +1044,7 @@ static int cb_h3_recv_header(nghttp3_conn *conn, int64_t sid,
	if(!result)
	h3_xfer_write_resp_hd(cf, data, stream, Curl_dyn_ptr(&ctx->scratch),
	Curl_dyn_len(&ctx->scratch), FALSE);
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] status: %s",
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] status: %s",
	stream_id, Curl_dyn_ptr(&ctx->scratch));
	if(result) {
	return -1;
@@ -1053,7 +1052,7 @@ static int cb_h3_recv_header(nghttp3_conn *conn, int64_t sid,
	}
	else {
	/* store as an HTTP1-style header */
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] header: %.s: %.s",
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] header: %.s: %.s",
	stream_id, (int)h3name.len, h3name.base,
	(int)h3val.len, h3val.base);
	Curl_dyn_reset(&ctx->scratch);
@@ -1105,7 +1104,7 @@ static int cb_h3_reset_stream(nghttp3_conn *conn, int64_t sid,

	rv = ngtcp2_conn_shutdown_stream_write(ctx->qconn, 0, stream_id,
	app_error_code);
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] reset -> %d", stream_id, rv);
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] reset -> %d", stream_id, rv);
	if(rv && rv != NGTCP2_ERR_STREAM_NOT_FOUND) {
	return NGHTTP3_ERR_CALLBACK_FAILURE;
	}
@@ -1200,14 +1199,13 @@ static ssize_t recv_closed_stream(struct Curl_cfilter *cf,

	(void)cf;
	if(stream->reset) {
-	failf(data,
-	"HTTP/3 stream %" CURL_PRId64 " reset by server", stream->id);
+	failf(data, "HTTP/3 stream %" FMT_PRId64 " reset by server", stream->id);
	*err = data->req.bytecount? CURLE_PARTIAL_FILE : CURLE_HTTP3;
	goto out;
	}
	else if(!stream->resp_hds_complete) {
	failf(data,
-	"HTTP/3 stream %" CURL_PRId64 " was closed cleanly, but before "
+	"HTTP/3 stream %" FMT_PRId64 " was closed cleanly, but before "
	"getting all response header fields, treated as error",
	stream->id);
	*err = CURLE_HTTP3;
@@ -1254,7 +1252,7 @@ static ssize_t cf_ngtcp2_recv(struct Curl_cfilter cf, struct Curl_easy data,
	}

	if(stream->xfer_result) {
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] xfer write failed", stream->id);
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] xfer write failed", stream->id);
	cf_ngtcp2_stream_close(cf, data, stream);
	*err = stream->xfer_result;
	nread = -1;
@@ -1279,7 +1277,7 @@ out:
	nread = -1;
	}
	}
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] cf_recv(blen=%zu) -> %zd, %d",
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] cf_recv(blen=%zu) -> %zd, %d",
	stream? stream->id : -1, blen, nread, *err);
	CF_DATA_RESTORE(cf, save);
	return nread;
@@ -1370,14 +1368,13 @@ cb_h3_read_req_body(nghttp3_conn *conn, int64_t stream_id,
	}
	else if(!nwritten) {
	/* Not EOF, and nothing to give, we signal WOULDBLOCK. */
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] read req body -> AGAIN",
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] read req body -> AGAIN",
	stream->id);
	return NGHTTP3_ERR_WOULDBLOCK;
	}

-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] read req body -> "
-	"%d vecs%s with %zu (buffered=%zu, left=%"
-	CURL_FORMAT_CURL_OFF_T ")",
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] read req body -> "
+	"%d vecs%s with %zu (buffered=%zu, left=%" FMT_OFF_T ")",
	stream->id, (int)nvecs,
	*pflags == NGHTTP3_DATA_FLAG_EOF?" EOF":"",
	nwritten, Curl_bufq_len(&stream->sendbuf),
@@ -1491,11 +1488,11 @@ static ssize_t h3_stream_open(struct Curl_cfilter *cf,
	if(rc) {
	switch(rc) {
	case NGHTTP3_ERR_CONN_CLOSING:
-	CURL_TRC_CF(data, cf, "h3sid[%" CURL_PRId64 "] failed to send, "
+	CURL_TRC_CF(data, cf, "h3sid[%" FMT_PRId64 "] failed to send, "
	"connection is closing", stream->id);
	break;
	default:
-	CURL_TRC_CF(data, cf, "h3sid[%" CURL_PRId64 "] failed to send -> "
+	CURL_TRC_CF(data, cf, "h3sid[%" FMT_PRId64 "] failed to send -> "
	"%d (%s)", stream->id, rc, nghttp3_strerror(rc));
	break;
	}
@@ -1505,10 +1502,10 @@ static ssize_t h3_stream_open(struct Curl_cfilter *cf,
	}

	if(Curl_trc_is_verbose(data)) {
-	infof(data, "[HTTP/3] [%" CURL_PRId64 "] OPENED stream for %s",
+	infof(data, "[HTTP/3] [%" FMT_PRId64 "] OPENED stream for %s",
	stream->id, data->state.url);
	for(i = 0; i < nheader; ++i) {
-	infof(data, "[HTTP/3] [%" CURL_PRId64 "] [%.s: %.s]", stream->id,
+	infof(data, "[HTTP/3] [%" FMT_PRId64 "] [%.s: %.s]", stream->id,
	(int)nva[i].namelen, nva[i].name,
	(int)nva[i].valuelen, nva[i].value);
	}
@@ -1560,7 +1557,7 @@ static ssize_t cf_ngtcp2_send(struct Curl_cfilter cf, struct Curl_easy data,
	stream = H3_STREAM_CTX(ctx, data);
	}
	else if(stream->xfer_result) {
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] xfer write failed", stream->id);
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] xfer write failed", stream->id);
	cf_ngtcp2_stream_close(cf, data, stream);
	*err = stream->xfer_result;
	sent = -1;
@@ -1573,13 +1570,13 @@ static ssize_t cf_ngtcp2_send(struct Curl_cfilter cf, struct Curl_easy data,
	* body. This happens on 30x or 40x responses.
	* We silently discard the data sent, since this is not a transport
	* error situation. */
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] discarding data"
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] discarding data"
	"on closed stream with response", stream->id);
	*err = CURLE_OK;
	sent = (ssize_t)len;
	goto out;
	}
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] send_body(len=%zu) "
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] send_body(len=%zu) "
	"-> stream closed", stream->id, len);
	*err = CURLE_HTTP3;
	sent = -1;
@@ -1593,7 +1590,7 @@ static ssize_t cf_ngtcp2_send(struct Curl_cfilter cf, struct Curl_easy data,
	}
	else {
	sent = Curl_bufq_write(&stream->sendbuf, buf, len, err);
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] cf_send, add to "
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] cf_send, add to "
	"sendbuf(len=%zu) -> %zd, %d",
	stream->id, len, sent, *err);
	if(sent < 0) {
@@ -1615,7 +1612,7 @@ out:
	*err = result;
	sent = -1;
	}
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] cf_send(len=%zu) -> %zd, %d",
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] cf_send(len=%zu) -> %zd, %d",
	stream? stream->id : -1, len, sent, *err);
	CF_DATA_RESTORE(cf, save);
	return sent;
@@ -1761,7 +1758,7 @@ static ssize_t read_pkt_to_send(void *userp,
	struct h3_stream_ctx *stream = H3_STREAM_CTX(ctx, x->data);
	DEBUGASSERT(ndatalen == -1);
	nghttp3_conn_block_stream(ctx->h3conn, stream_id);
-	CURL_TRC_CF(x->data, x->cf, "[%" CURL_PRId64 "] block quic flow",
+	CURL_TRC_CF(x->data, x->cf, "[%" FMT_PRId64 "] block quic flow",
	(curl_int64_t)stream_id);
	DEBUGASSERT(stream);
	if(stream)
@@ -2060,7 +2057,7 @@ static CURLcode cf_ngtcp2_shutdown(struct Curl_cfilter *cf,
	(uint8_t *)buffer, sizeof(buffer),
	&ctx->last_error, pktx.ts);
	CURL_TRC_CF(data, cf, "start shutdown(err_type=%d, err_code=%"
-	CURL_PRIu64 ") -> %d", ctx->last_error.type,
+	FMT_PRIu64 ") -> %d", ctx->last_error.type,
	(curl_uint64_t)ctx->last_error.error_code, (int)nwritten);
	if(nwritten > 0) {
	Curl_bufq_write(&ctx->q.sendbuf, (const unsigned char *)buffer,
@@ -2408,7 +2405,7 @@ static CURLcode cf_ngtcp2_query(struct Curl_cfilter *cf,
	}
	else /* transport params not arrived yet? take our default. */
	*pres1 = (int)Curl_multi_max_concurrent_streams(data->multi);
-	CURL_TRC_CF(data, cf, "query conn[%" CURL_FORMAT_CURL_OFF_T "]: "
+	CURL_TRC_CF(data, cf, "query conn[%" FMT_OFF_T "]: "
	"MAX_CONCURRENT -> %d (%zu in use)",
	cf->conn->connection_id, *pres1, CONN_INUSE(cf->conn));
	CF_DATA_RESTORE(cf, save);

lib/vquic/curl_osslq.c+42 -43

@@ -453,7 +453,7 @@ static CURLcode cf_osslq_h3conn_add_stream(struct cf_osslq_h3conn *h3,

	if(h3->remote_ctrl_n >= ARRAYSIZE(h3->remote_ctrl)) {
	/* rejected, we are full */
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] rejecting remote stream",
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] rejecting remote stream",
	stream_id);
	SSL_free(stream_ssl);
	return CURLE_FAILED_INIT;
@@ -464,12 +464,12 @@ static CURLcode cf_osslq_h3conn_add_stream(struct cf_osslq_h3conn *h3,
	nstream->id = stream_id;
	nstream->ssl = stream_ssl;
	Curl_bufq_initp(&nstream->recvbuf, &ctx->stream_bufcp, 1, BUFQ_OPT_NONE);
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] accepted remote uni stream",
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] accepted remote uni stream",
	stream_id);
	break;
	}
	default:
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] reject remote non-uni-read"
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] reject remote non-uni-read"
	" stream", stream_id);
	SSL_free(stream_ssl);
	return CURLE_FAILED_INIT;
@@ -650,7 +650,7 @@ static void h3_data_done(struct Curl_cfilter cf, struct Curl_easy data)

	(void)cf;
	if(stream) {
-	CURL_TRC_CF(data, cf, "[%"CURL_PRId64"] easy handle is done",
+	CURL_TRC_CF(data, cf, "[%"FMT_PRId64"] easy handle is done",
	stream->s.id);
	if(ctx->h3.conn && !stream->closed) {
	nghttp3_conn_shutdown_stream_read(ctx->h3.conn, stream->s.id);
@@ -748,11 +748,11 @@ static int cb_h3_stream_close(nghttp3_conn *conn, int64_t stream_id,
	if(stream->error3 != NGHTTP3_H3_NO_ERROR) {
	stream->reset = TRUE;
	stream->send_closed = TRUE;
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] RESET: error %" CURL_PRIu64,
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] RESET: error %" FMT_PRIu64,
	stream->s.id, stream->error3);
	}
	else {
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] CLOSED", stream->s.id);
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] CLOSED", stream->s.id);
	}
	h3_drain_stream(cf, data);
	return 0;
@@ -812,12 +812,12 @@ static int cb_h3_recv_data(nghttp3_conn *conn, int64_t stream3_id,

	result = write_resp_raw(cf, data, buf, buflen, TRUE);
	if(result) {
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] DATA len=%zu, ERROR %d",
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] DATA len=%zu, ERROR %d",
	stream->s.id, buflen, result);
	return NGHTTP3_ERR_CALLBACK_FAILURE;
	}
	stream->download_recvd += (curl_off_t)buflen;
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] DATA len=%zu, total=%zd",
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] DATA len=%zu, total=%zd",
	stream->s.id, buflen, stream->download_recvd);
	h3_drain_stream(cf, data);
	return 0;
@@ -835,7 +835,7 @@ static int cb_h3_deferred_consume(nghttp3_conn *conn, int64_t stream_id,
	(void)conn;
	(void)stream_id;
	if(stream)
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] deferred consume %zu bytes",
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] deferred consume %zu bytes",
	stream->s.id, consumed);
	return 0;
	}
@@ -873,7 +873,7 @@ static int cb_h3_recv_header(nghttp3_conn *conn, int64_t sid,
	return -1;
	ncopy = msnprintf(line, sizeof(line), "HTTP/3 %03d \r\n",
	stream->status_code);
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] status: %s", stream_id, line);
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] status: %s", stream_id, line);
	result = write_resp_raw(cf, data, line, ncopy, FALSE);
	if(result) {
	return -1;
@@ -881,7 +881,7 @@ static int cb_h3_recv_header(nghttp3_conn *conn, int64_t sid,
	}
	else {
	/* store as an HTTP1-style header */
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] header: %.s: %.s",
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] header: %.s: %.s",
	stream_id, (int)h3name.len, h3name.base,
	(int)h3val.len, h3val.base);
	result = write_resp_raw(cf, data, h3name.base, h3name.len, FALSE);
@@ -926,7 +926,7 @@ static int cb_h3_end_headers(nghttp3_conn *conn, int64_t sid,
	return -1;
	}

-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] end_headers, status=%d",
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] end_headers, status=%d",
	stream_id, stream->status_code);
	if(stream->status_code / 100 != 1) {
	stream->resp_hds_complete = TRUE;
@@ -950,7 +950,7 @@ static int cb_h3_stop_sending(nghttp3_conn *conn, int64_t sid,
	if(!stream \|\| !stream->s.ssl)
	return 0;

-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] stop_sending", stream_id);
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] stop_sending", stream_id);
	cf_osslq_stream_close(&stream->s);
	return 0;
	}
@@ -970,7 +970,7 @@ static int cb_h3_reset_stream(nghttp3_conn *conn, int64_t sid,
	SSL_STREAM_RESET_ARGS args = {0};
	args.quic_error_code = app_error_code;
	rv = !SSL_stream_reset(stream->s.ssl, &args, sizeof(args));
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] reset -> %d", stream_id, rv);
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] reset -> %d", stream_id, rv);
	if(!rv) {
	return NGHTTP3_ERR_CALLBACK_FAILURE;
	}
@@ -1030,14 +1030,13 @@ cb_h3_read_req_body(nghttp3_conn *conn, int64_t stream_id,
	}
	else if(!nwritten) {
	/* Not EOF, and nothing to give, we signal WOULDBLOCK. */
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] read req body -> AGAIN",
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] read req body -> AGAIN",
	stream->s.id);
	return NGHTTP3_ERR_WOULDBLOCK;
	}

-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] read req body -> "
-	"%d vecs%s with %zu (buffered=%zu, left=%"
-	CURL_FORMAT_CURL_OFF_T ")",
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] read req body -> "
+	"%d vecs%s with %zu (buffered=%zu, left=%" FMT_OFF_T ")",
	stream->s.id, (int)nvecs,
	*pflags == NGHTTP3_DATA_FLAG_EOF?" EOF":"",
	nwritten, Curl_bufq_len(&stream->sendbuf),
@@ -1277,7 +1276,7 @@ static ssize_t h3_quic_recv(void *reader_ctx,
	return -1;
	}
	else if(detail == SSL_ERROR_ZERO_RETURN) {
-	CURL_TRC_CF(x->data, x->cf, "[%" CURL_PRId64 "] h3_quic_recv -> EOS",
+	CURL_TRC_CF(x->data, x->cf, "[%" FMT_PRId64 "] h3_quic_recv -> EOS",
	x->s->id);
	x->s->recvd_eos = TRUE;
	return 0;
@@ -1286,8 +1285,8 @@ static ssize_t h3_quic_recv(void *reader_ctx,
	SSL_STREAM_STATE_RESET_REMOTE) {
	uint64_t app_error_code = NGHTTP3_H3_NO_ERROR;
	SSL_get_stream_read_error_code(x->s->ssl, &app_error_code);
-	CURL_TRC_CF(x->data, x->cf, "[%" CURL_PRId64 "] h3_quic_recv -> RESET, "
-	"rv=%d, app_err=%" CURL_PRIu64,
+	CURL_TRC_CF(x->data, x->cf, "[%" FMT_PRId64 "] h3_quic_recv -> RESET, "
+	"rv=%d, app_err=%" FMT_PRIu64,
	x->s->id, rv, (curl_uint64_t)app_error_code);
	if(app_error_code != NGHTTP3_H3_NO_ERROR) {
	x->s->reset = TRUE;
@@ -1343,7 +1342,7 @@ static CURLcode cf_osslq_stream_recv(struct cf_osslq_stream *s,
	while(Curl_bufq_peek(&s->recvbuf, &buf, &blen)) {
	nread = nghttp3_conn_read_stream(ctx->h3.conn, s->id,
	buf, blen, 0);
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] forward %zu bytes "
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] forward %zu bytes "
	"to nghttp3 -> %zd", s->id, blen, nread);
	if(nread < 0) {
	failf(data, "nghttp3_conn_read_stream(len=%zu) error: %s",
@@ -1382,7 +1381,7 @@ static CURLcode cf_osslq_stream_recv(struct cf_osslq_stream *s,
	rv = nghttp3_conn_close_stream(ctx->h3.conn, s->id,
	NGHTTP3_H3_NO_ERROR);
	s->closed = TRUE;
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] close nghttp3 stream -> %d",
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] close nghttp3 stream -> %d",
	s->id, rv);
	if(rv < 0 && rv != NGHTTP3_ERR_STREAM_NOT_FOUND) {
	failf(data, "nghttp3_conn_close_stream returned error: %s",
@@ -1395,7 +1394,7 @@ static CURLcode cf_osslq_stream_recv(struct cf_osslq_stream *s,
	}
	out:
	if(result)
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] cf_osslq_stream_recv -> %d",
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] cf_osslq_stream_recv -> %d",
	s->id, result);
	return result;
	}
@@ -1521,7 +1520,7 @@ static CURLcode h3_send_streams(struct Curl_cfilter *cf,
	s = cf_osslq_get_qstream(cf, data, stream_id);
	if(!s) {
	failf(data, "nghttp3_conn_writev_stream gave unknown stream %"
-	CURL_PRId64, (curl_int64_t)stream_id);
+	FMT_PRId64, (curl_int64_t)stream_id);
	result = CURLE_SEND_ERROR;
	goto out;
	}
@@ -1542,7 +1541,7 @@ static CURLcode h3_send_streams(struct Curl_cfilter *cf,
	if(ok) {
	/* As OpenSSL buffers the data, we count this as acknowledged
	* from nghttp3's point of view */
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] send %zu bytes to QUIC ok",
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] send %zu bytes to QUIC ok",
	s->id, vec[i].len);
	acked_len += vec[i].len;
	}
@@ -1552,14 +1551,14 @@ static CURLcode h3_send_streams(struct Curl_cfilter *cf,
	case SSL_ERROR_WANT_WRITE:
	case SSL_ERROR_WANT_READ:
	/* QUIC blocked us from writing more */
-	CURL_TRC_CF(data, cf, "[%"CURL_PRId64 "] send %zu bytes to "
+	CURL_TRC_CF(data, cf, "[%"FMT_PRId64 "] send %zu bytes to "
	"QUIC blocked", s->id, vec[i].len);
	written = 0;
	nghttp3_conn_block_stream(ctx->h3.conn, s->id);
	s->send_blocked = blocked = TRUE;
	break;
	default:
-	failf(data, "[%"CURL_PRId64 "] send %zu bytes to QUIC, SSL error %d",
+	failf(data, "[%"FMT_PRId64 "] send %zu bytes to QUIC, SSL error %d",
	s->id, vec[i].len, detail);
	result = cf_osslq_ssl_err(cf, data, detail, CURLE_HTTP3);
	goto out;
@@ -1585,13 +1584,13 @@ static CURLcode h3_send_streams(struct Curl_cfilter *cf,
	result = CURLE_SEND_ERROR;
	goto out;
	}
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] forwarded %zu/%zu h3 bytes "
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] forwarded %zu/%zu h3 bytes "
	"to QUIC, eos=%d", s->id, acked_len, total_len, eos);
	}

	if(eos && !s->send_blocked && !eos_written) {
	/* wrote everything and H3 indicates end of stream */
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] closing QUIC stream", s->id);
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] closing QUIC stream", s->id);
	SSL_stream_conclude(s->ssl, 0);
	}
	}
@@ -1884,11 +1883,11 @@ static ssize_t h3_stream_open(struct Curl_cfilter *cf,
	if(rc) {
	switch(rc) {
	case NGHTTP3_ERR_CONN_CLOSING:
-	CURL_TRC_CF(data, cf, "h3sid[%"CURL_PRId64"] failed to send, "
+	CURL_TRC_CF(data, cf, "h3sid[%"FMT_PRId64"] failed to send, "
	"connection is closing", stream->s.id);
	break;
	default:
-	CURL_TRC_CF(data, cf, "h3sid[%"CURL_PRId64 "] failed to send -> %d (%s)",
+	CURL_TRC_CF(data, cf, "h3sid[%"FMT_PRId64 "] failed to send -> %d (%s)",
	stream->s.id, rc, nghttp3_strerror(rc));
	break;
	}
@@ -1898,10 +1897,10 @@ static ssize_t h3_stream_open(struct Curl_cfilter *cf,
	}

	if(Curl_trc_is_verbose(data)) {
-	infof(data, "[HTTP/3] [%" CURL_PRId64 "] OPENED stream for %s",
+	infof(data, "[HTTP/3] [%" FMT_PRId64 "] OPENED stream for %s",
	stream->s.id, data->state.url);
	for(i = 0; i < nheader; ++i) {
-	infof(data, "[HTTP/3] [%" CURL_PRId64 "] [%.s: %.s]",
+	infof(data, "[HTTP/3] [%" FMT_PRId64 "] [%.s: %.s]",
	stream->s.id,
	(int)nva[i].namelen, nva[i].name,
	(int)nva[i].valuelen, nva[i].value);
@@ -1960,13 +1959,13 @@ static ssize_t cf_osslq_send(struct Curl_cfilter cf, struct Curl_easy data,
	* body. This happens on 30x or 40x responses.
	* We silently discard the data sent, since this is not a transport
	* error situation. */
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] discarding data"
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] discarding data"
	"on closed stream with response", stream->s.id);
	*err = CURLE_OK;
	nwritten = (ssize_t)len;
	goto out;
	}
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] send_body(len=%zu) "
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] send_body(len=%zu) "
	"-> stream closed", stream->s.id, len);
	*err = CURLE_HTTP3;
	nwritten = -1;
@@ -1974,7 +1973,7 @@ static ssize_t cf_osslq_send(struct Curl_cfilter cf, struct Curl_easy data,
	}
	else {
	nwritten = Curl_bufq_write(&stream->sendbuf, buf, len, err);
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] cf_send, add to "
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] cf_send, add to "
	"sendbuf(len=%zu) -> %zd, %d",
	stream->s.id, len, nwritten, *err);
	if(nwritten < 0) {
@@ -1992,7 +1991,7 @@ static ssize_t cf_osslq_send(struct Curl_cfilter cf, struct Curl_easy data,

	out:
	result = check_and_set_expiry(cf, data);
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] cf_send(len=%zu) -> %zd, %d",
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] cf_send(len=%zu) -> %zd, %d",
	stream? stream->s.id : -1, len, nwritten, *err);
	CF_DATA_RESTORE(cf, save);
	return nwritten;
@@ -2008,14 +2007,14 @@ static ssize_t recv_closed_stream(struct Curl_cfilter *cf,
	(void)cf;
	if(stream->reset) {
	failf(data,
-	"HTTP/3 stream %" CURL_PRId64 " reset by server",
+	"HTTP/3 stream %" FMT_PRId64 " reset by server",
	stream->s.id);
	*err = data->req.bytecount? CURLE_PARTIAL_FILE : CURLE_HTTP3;
	goto out;
	}
	else if(!stream->resp_hds_complete) {
	failf(data,
-	"HTTP/3 stream %" CURL_PRId64
+	"HTTP/3 stream %" FMT_PRId64
	" was closed cleanly, but before getting"
	" all response header fields, treated as error",
	stream->s.id);
@@ -2055,7 +2054,7 @@ static ssize_t cf_osslq_recv(struct Curl_cfilter cf, struct Curl_easy data,
	nread = Curl_bufq_read(&stream->recvbuf,
	(unsigned char *)buf, len, err);
	if(nread < 0) {
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] read recvbuf(len=%zu) "
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] read recvbuf(len=%zu) "
	"-> %zd, %d", stream->s.id, len, nread, *err);
	goto out;
	}
@@ -2073,7 +2072,7 @@ static ssize_t cf_osslq_recv(struct Curl_cfilter cf, struct Curl_easy data,
	nread = Curl_bufq_read(&stream->recvbuf,
	(unsigned char *)buf, len, err);
	if(nread < 0) {
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] read recvbuf(len=%zu) "
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] read recvbuf(len=%zu) "
	"-> %zd, %d", stream->s.id, len, nread, *err);
	goto out;
	}
@@ -2103,7 +2102,7 @@ out:
	nread = -1;
	}
	}
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] cf_recv(len=%zu) -> %zd, %d",
+	CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] cf_recv(len=%zu) -> %zd, %d",
	stream? stream->s.id : -1, len, nread, *err);
	CF_DATA_RESTORE(cf, save);
	return nread;

lib/vquic/curl_quiche.c+38 -38

@@ -211,7 +211,7 @@ static void check_resumes(struct Curl_cfilter *cf,
	if(stream && stream->quic_flow_blocked) {
	stream->quic_flow_blocked = FALSE;
	Curl_expire(data, 0, EXPIRE_RUN_NOW);
-	CURL_TRC_CF(data, cf, "[%"CURL_PRIu64"] unblock", stream->id);
+	CURL_TRC_CF(data, cf, "[%"FMT_PRIu64"] unblock", stream->id);
	}
	}
	}
@@ -251,7 +251,7 @@ static void h3_data_done(struct Curl_cfilter cf, struct Curl_easy data)

	(void)cf;
	if(stream) {
-	CURL_TRC_CF(data, cf, "[%"CURL_PRIu64"] easy handle is done", stream->id);
+	CURL_TRC_CF(data, cf, "[%"FMT_PRIu64"] easy handle is done", stream->id);
	if(ctx->qconn && !stream->closed) {
	quiche_conn_stream_shutdown(ctx->qconn, stream->id,
	QUICHE_SHUTDOWN_READ, CURL_H3_NO_ERROR);
@@ -382,7 +382,7 @@ static int cb_each_header(uint8_t *name, size_t name_len,
	return CURLE_OK;

	if((name_len == 7) && !strncmp(HTTP_PSEUDO_STATUS, (char *)name, 7)) {
-	CURL_TRC_CF(x->data, x->cf, "[%" CURL_PRIu64 "] status: %.*s",
+	CURL_TRC_CF(x->data, x->cf, "[%" FMT_PRIu64 "] status: %.*s",
	stream->id, (int)value_len, value);
	result = write_resp_raw(x->cf, x->data, "HTTP/3 ", sizeof("HTTP/3 ") - 1);
	if(!result)
@@ -391,7 +391,7 @@ static int cb_each_header(uint8_t *name, size_t name_len,
	result = write_resp_raw(x->cf, x->data, " \r\n", 3);
	}
	else {
-	CURL_TRC_CF(x->data, x->cf, "[%" CURL_PRIu64 "] header: %.s: %.s",
+	CURL_TRC_CF(x->data, x->cf, "[%" FMT_PRIu64 "] header: %.s: %.s",
	stream->id, (int)name_len, name,
	(int)value_len, value);
	result = write_resp_raw(x->cf, x->data, name, name_len);
@@ -403,7 +403,7 @@ static int cb_each_header(uint8_t *name, size_t name_len,
	result = write_resp_raw(x->cf, x->data, "\r\n", 2);
	}
	if(result) {
-	CURL_TRC_CF(x->data, x->cf, "[%"CURL_PRIu64"] on header error %d",
+	CURL_TRC_CF(x->data, x->cf, "[%"FMT_PRIu64"] on header error %d",
	stream->id, result);
	}
	return result;
@@ -460,9 +460,9 @@ static CURLcode cf_recv_body(struct Curl_cfilter *cf,
	stream_resp_read, &cb_ctx, &result);

	if(nwritten < 0 && result != CURLE_AGAIN) {
-	CURL_TRC_CF(data, cf, "[%"CURL_PRIu64"] recv_body error %zd",
+	CURL_TRC_CF(data, cf, "[%"FMT_PRIu64"] recv_body error %zd",
	stream->id, nwritten);
-	failf(data, "Error %d in HTTP/3 response body for stream[%"CURL_PRIu64"]",
+	failf(data, "Error %d in HTTP/3 response body for stream[%"FMT_PRIu64"]",
	result, stream->id);
	stream->closed = TRUE;
	stream->reset = TRUE;
@@ -514,10 +514,10 @@ static CURLcode h3_process_event(struct Curl_cfilter *cf,
	rc = quiche_h3_event_for_each_header(ev, cb_each_header, &cb_ctx);
	if(rc) {
	failf(data, "Error %d in HTTP/3 response header for stream[%"
-	CURL_PRIu64"]", rc, stream->id);
+	FMT_PRIu64"]", rc, stream->id);
	return CURLE_RECV_ERROR;
	}
-	CURL_TRC_CF(data, cf, "[%"CURL_PRIu64"] <- [HEADERS]", stream->id);
+	CURL_TRC_CF(data, cf, "[%"FMT_PRIu64"] <- [HEADERS]", stream->id);
	break;

	case QUICHE_H3_EVENT_DATA:
@@ -527,7 +527,7 @@ static CURLcode h3_process_event(struct Curl_cfilter *cf,
	break;

	case QUICHE_H3_EVENT_RESET:
-	CURL_TRC_CF(data, cf, "[%"CURL_PRIu64"] RESET", stream->id);
+	CURL_TRC_CF(data, cf, "[%"FMT_PRIu64"] RESET", stream->id);
	stream->closed = TRUE;
	stream->reset = TRUE;
	stream->send_closed = TRUE;
@@ -535,7 +535,7 @@ static CURLcode h3_process_event(struct Curl_cfilter *cf,
	break;

	case QUICHE_H3_EVENT_FINISHED:
-	CURL_TRC_CF(data, cf, "[%"CURL_PRIu64"] CLOSED", stream->id);
+	CURL_TRC_CF(data, cf, "[%"FMT_PRIu64"] CLOSED", stream->id);
	if(!stream->resp_hds_complete) {
	result = write_resp_raw(cf, data, "\r\n", 2);
	if(result)
@@ -547,11 +547,11 @@ static CURLcode h3_process_event(struct Curl_cfilter *cf,
	break;

	case QUICHE_H3_EVENT_GOAWAY:
-	CURL_TRC_CF(data, cf, "[%"CURL_PRIu64"] <- [GOAWAY]", stream->id);
+	CURL_TRC_CF(data, cf, "[%"FMT_PRIu64"] <- [GOAWAY]", stream->id);
	break;

	default:
-	CURL_TRC_CF(data, cf, "[%"CURL_PRIu64"] recv, unhandled event %d",
+	CURL_TRC_CF(data, cf, "[%"FMT_PRIu64"] recv, unhandled event %d",
	stream->id, quiche_h3_event_type(ev));
	break;
	}
@@ -574,13 +574,13 @@ static CURLcode cf_poll_events(struct Curl_cfilter *cf,
	break;
	}
	else if(stream3_id < 0) {
-	CURL_TRC_CF(data, cf, "error poll: %"CURL_PRId64, stream3_id);
+	CURL_TRC_CF(data, cf, "error poll: %"FMT_PRId64, stream3_id);
	return CURLE_HTTP3;
	}

	sdata = get_stream_easy(cf, data, stream3_id, &stream);
	if(!sdata \|\| !stream) {
-	CURL_TRC_CF(data, cf, "discard event %s for unknown [%"CURL_PRId64"]",
+	CURL_TRC_CF(data, cf, "discard event %s for unknown [%"FMT_PRId64"]",
	cf_ev_name(ev), stream3_id);
	}
	else {
@@ -588,7 +588,7 @@ static CURLcode cf_poll_events(struct Curl_cfilter *cf,
	drain_stream(cf, sdata);
	if(result) {
	CURL_TRC_CF(data, cf, "error processing event %s "
-	"for [%"CURL_PRIu64"] -> %d", cf_ev_name(ev),
+	"for [%"FMT_PRIu64"] -> %d", cf_ev_name(ev),
	stream3_id, result);
	if(data == sdata) {
	/* Only report this error to the caller if it is about the
@@ -818,19 +818,19 @@ static ssize_t recv_closed_stream(struct Curl_cfilter *cf,
	DEBUGASSERT(stream);
	if(stream->reset) {
	failf(data,
-	"HTTP/3 stream %" CURL_PRIu64 " reset by server", stream->id);
+	"HTTP/3 stream %" FMT_PRIu64 " reset by server", stream->id);
	*err = data->req.bytecount? CURLE_PARTIAL_FILE : CURLE_HTTP3;
-	CURL_TRC_CF(data, cf, "[%" CURL_PRIu64 "] cf_recv, was reset -> %d",
+	CURL_TRC_CF(data, cf, "[%" FMT_PRIu64 "] cf_recv, was reset -> %d",
	stream->id, *err);
	}
	else if(!stream->resp_got_header) {
	failf(data,
-	"HTTP/3 stream %" CURL_PRIu64 " was closed cleanly, but before "
+	"HTTP/3 stream %" FMT_PRIu64 " was closed cleanly, but before "
	"getting all response header fields, treated as error",
	stream->id);
	/* err = CURLE_PARTIAL_FILE; /
	*err = CURLE_HTTP3;
-	CURL_TRC_CF(data, cf, "[%" CURL_PRIu64 "] cf_recv, closed incomplete"
+	CURL_TRC_CF(data, cf, "[%" FMT_PRIu64 "] cf_recv, closed incomplete"
	" -> %d", stream->id, *err);
	}
	else {
@@ -858,7 +858,7 @@ static ssize_t cf_quiche_recv(struct Curl_cfilter cf, struct Curl_easy data,
	if(!Curl_bufq_is_empty(&stream->recvbuf)) {
	nread = Curl_bufq_read(&stream->recvbuf,
	(unsigned char *)buf, len, err);
-	CURL_TRC_CF(data, cf, "[%" CURL_PRIu64 "] read recvbuf(len=%zu) "
+	CURL_TRC_CF(data, cf, "[%" FMT_PRIu64 "] read recvbuf(len=%zu) "
	"-> %zd, %d", stream->id, len, nread, *err);
	if(nread < 0)
	goto out;
@@ -875,7 +875,7 @@ static ssize_t cf_quiche_recv(struct Curl_cfilter cf, struct Curl_easy data,
	if(nread < 0 && !Curl_bufq_is_empty(&stream->recvbuf)) {
	nread = Curl_bufq_read(&stream->recvbuf,
	(unsigned char *)buf, len, err);
-	CURL_TRC_CF(data, cf, "[%" CURL_PRIu64 "] read recvbuf(len=%zu) "
+	CURL_TRC_CF(data, cf, "[%" FMT_PRIu64 "] read recvbuf(len=%zu) "
	"-> %zd, %d", stream->id, len, nread, *err);
	if(nread < 0)
	goto out;
@@ -909,8 +909,8 @@ out:
	}
	if(nread > 0)
	ctx->data_recvd += nread;
-	CURL_TRC_CF(data, cf, "[%"CURL_PRIu64"] cf_recv(total=%"
-	CURL_FORMAT_CURL_OFF_T ") -> %zd, %d",
+	CURL_TRC_CF(data, cf, "[%"FMT_PRIu64"] cf_recv(total=%"
+	FMT_OFF_T ") -> %zd, %d",
	stream->id, ctx->data_recvd, nread, *err);
	return nread;
	}
@@ -930,7 +930,7 @@ static ssize_t cf_quiche_send_body(struct Curl_cfilter *cf,
	/* TODO: we seem to be blocked on flow control and should HOLD
	* sending. But when do we open again? */
	if(!quiche_conn_stream_writable(ctx->qconn, stream->id, len)) {
-	CURL_TRC_CF(data, cf, "[%" CURL_PRIu64 "] send_body(len=%zu) "
+	CURL_TRC_CF(data, cf, "[%" FMT_PRIu64 "] send_body(len=%zu) "
	"-> window exhausted", stream->id, len);
	stream->quic_flow_blocked = TRUE;
	}
@@ -938,19 +938,19 @@ static ssize_t cf_quiche_send_body(struct Curl_cfilter *cf,
	return -1;
	}
	else if(nwritten == QUICHE_H3_TRANSPORT_ERR_INVALID_STREAM_STATE) {
-	CURL_TRC_CF(data, cf, "[%" CURL_PRIu64 "] send_body(len=%zu) "
+	CURL_TRC_CF(data, cf, "[%" FMT_PRIu64 "] send_body(len=%zu) "
	"-> invalid stream state", stream->id, len);
	*err = CURLE_HTTP3;
	return -1;
	}
	else if(nwritten == QUICHE_H3_TRANSPORT_ERR_FINAL_SIZE) {
-	CURL_TRC_CF(data, cf, "[%" CURL_PRIu64 "] send_body(len=%zu) "
+	CURL_TRC_CF(data, cf, "[%" FMT_PRIu64 "] send_body(len=%zu) "
	"-> exceeds size", stream->id, len);
	*err = CURLE_SEND_ERROR;
	return -1;
	}
	else if(nwritten < 0) {
-	CURL_TRC_CF(data, cf, "[%" CURL_PRIu64 "] send_body(len=%zu) "
+	CURL_TRC_CF(data, cf, "[%" FMT_PRIu64 "] send_body(len=%zu) "
	"-> quiche err %zd", stream->id, len, nwritten);
	*err = CURLE_SEND_ERROR;
	return -1;
@@ -958,7 +958,7 @@ static ssize_t cf_quiche_send_body(struct Curl_cfilter *cf,
	else {
	if(eos && (len == (size_t)nwritten))
	stream->send_closed = TRUE;
-	CURL_TRC_CF(data, cf, "[%" CURL_PRIu64 "] send body(len=%zu, "
+	CURL_TRC_CF(data, cf, "[%" FMT_PRIu64 "] send body(len=%zu, "
	"eos=%d) -> %zd",
	stream->id, len, stream->send_closed, nwritten);
	*err = CURLE_OK;
@@ -1037,14 +1037,14 @@ static ssize_t h3_open_stream(struct Curl_cfilter *cf,
	if(QUICHE_H3_ERR_STREAM_BLOCKED == stream3_id) {
	/* quiche seems to report this error if the connection window is
	* exhausted. Which happens frequently and intermittent. */
-	CURL_TRC_CF(data, cf, "[%"CURL_PRIu64"] blocked", stream->id);
+	CURL_TRC_CF(data, cf, "[%"FMT_PRIu64"] blocked", stream->id);
	stream->quic_flow_blocked = TRUE;
	*err = CURLE_AGAIN;
	nwritten = -1;
	goto out;
	}
	else {
-	CURL_TRC_CF(data, cf, "send_request(%s) -> %" CURL_PRIu64,
+	CURL_TRC_CF(data, cf, "send_request(%s) -> %" FMT_PRIu64,
	data->state.url, stream3_id);
	}
	*err = CURLE_SEND_ERROR;
@@ -1060,10 +1060,10 @@ static ssize_t h3_open_stream(struct Curl_cfilter *cf,
	stream->reset = FALSE;

	if(Curl_trc_is_verbose(data)) {
-	infof(data, "[HTTP/3] [%" CURL_PRIu64 "] OPENED stream for %s",
+	infof(data, "[HTTP/3] [%" FMT_PRIu64 "] OPENED stream for %s",
	stream->id, data->state.url);
	for(i = 0; i < nheader; ++i) {
-	infof(data, "[HTTP/3] [%" CURL_PRIu64 "] [%.s: %.s]", stream->id,
+	infof(data, "[HTTP/3] [%" FMT_PRIu64 "] [%.s: %.s]", stream->id,
	(int)nva[i].name_len, nva[i].name,
	(int)nva[i].value_len, nva[i].value);
	}
@@ -1124,13 +1124,13 @@ static ssize_t cf_quiche_send(struct Curl_cfilter cf, struct Curl_easy data,
	* sending the 30x response.
	* This is sort of a race: had the transfer loop called recv first,
	* it would see the response and stop/discard sending on its own- */
-	CURL_TRC_CF(data, cf, "[%" CURL_PRIu64 "] discarding data"
+	CURL_TRC_CF(data, cf, "[%" FMT_PRIu64 "] discarding data"
	"on closed stream with response", stream->id);
	*err = CURLE_OK;
	nwritten = (ssize_t)len;
	goto out;
	}
-	CURL_TRC_CF(data, cf, "[%" CURL_PRIu64 "] send_body(len=%zu) "
+	CURL_TRC_CF(data, cf, "[%" FMT_PRIu64 "] send_body(len=%zu) "
	"-> stream closed", stream->id, len);
	*err = CURLE_HTTP3;
	nwritten = -1;
@@ -1146,7 +1146,7 @@ out:
	*err = result;
	nwritten = -1;
	}
-	CURL_TRC_CF(data, cf, "[%" CURL_PRIu64 "] cf_send(len=%zu) -> %zd, %d",
+	CURL_TRC_CF(data, cf, "[%" FMT_PRIu64 "] cf_send(len=%zu) -> %zd, %d",
	stream? stream->id : (curl_uint64_t)~0, len, nwritten, *err);
	return nwritten;
	}
@@ -1244,7 +1244,7 @@ static CURLcode cf_quiche_data_event(struct Curl_cfilter *cf,
	stream->send_closed = TRUE;
	body[0] = 'X';
	sent = cf_quiche_send(cf, data, body, 0, TRUE, &result);
-	CURL_TRC_CF(data, cf, "[%"CURL_PRIu64"] DONE_SEND -> %zd, %d",
+	CURL_TRC_CF(data, cf, "[%"FMT_PRIu64"] DONE_SEND -> %zd, %d",
	stream->id, sent, result);
	}
	break;
@@ -1555,7 +1555,7 @@ static CURLcode cf_quiche_query(struct Curl_cfilter *cf,
	max_streams += quiche_conn_peer_streams_left_bidi(ctx->qconn);
	}
	*pres1 = (max_streams > INT_MAX)? INT_MAX : (int)max_streams;
-	CURL_TRC_CF(data, cf, "query conn[%" CURL_FORMAT_CURL_OFF_T "]: "
+	CURL_TRC_CF(data, cf, "query conn[%" FMT_OFF_T "]: "
	"MAX_CONCURRENT -> %d (%zu in use)",
	cf->conn->connection_id, *pres1, CONN_INUSE(cf->conn));
	return CURLE_OK;

lib/vssh/libssh.c+8 -11

@@ -1236,7 +1236,7 @@ static CURLcode myssh_statemach_act(struct Curl_easy data, bool block)
	if(attrs) {
	curl_off_t size = attrs->size;
	if(size < 0) {
-	failf(data, "Bad file size (%" CURL_FORMAT_CURL_OFF_T ")", size);
+	failf(data, "Bad file size (%" FMT_OFF_T ")", size);
	MOVE_TO_ERROR_STATE(CURLE_BAD_DOWNLOAD_RESUME);
	break;
	}
@@ -1621,7 +1621,7 @@ static CURLcode myssh_statemach_act(struct Curl_easy data, bool block)
	sftp_attributes_free(attrs);

	if(size < 0) {
-	failf(data, "Bad file size (%" CURL_FORMAT_CURL_OFF_T ")", size);
+	failf(data, "Bad file size (%" FMT_OFF_T ")", size);
	return CURLE_BAD_DOWNLOAD_RESUME;
	}
	if(data->state.use_range) {
@@ -1651,9 +1651,8 @@ static CURLcode myssh_statemach_act(struct Curl_easy data, bool block)
	to = size - 1;
	}
	if(from > size) {
-	failf(data, "Offset (%"
-	CURL_FORMAT_CURL_OFF_T ") was beyond file size (%"
-	CURL_FORMAT_CURL_OFF_T ")", from, size);
+	failf(data, "Offset (%" FMT_OFF_T ") was beyond file size (%"
+	FMT_OFF_T ")", from, size);
	return CURLE_BAD_DOWNLOAD_RESUME;
	}
	if(from > to) {
@@ -1682,10 +1681,8 @@ static CURLcode myssh_statemach_act(struct Curl_easy data, bool block)
	if(data->state.resume_from < 0) {
	/* We are supposed to download the last abs(from) bytes */
	if((curl_off_t)size < -data->state.resume_from) {
-	failf(data, "Offset (%"
-	CURL_FORMAT_CURL_OFF_T ") was beyond file size (%"
-	CURL_FORMAT_CURL_OFF_T ")",
-	data->state.resume_from, size);
+	failf(data, "Offset (%" FMT_OFF_T ") was beyond file size (%"
+	FMT_OFF_T ")", data->state.resume_from, size);
	return CURLE_BAD_DOWNLOAD_RESUME;
	}
	/* download from where? */
@@ -1693,8 +1690,8 @@ static CURLcode myssh_statemach_act(struct Curl_easy data, bool block)
	}
	else {
	if((curl_off_t)size < data->state.resume_from) {
-	failf(data, "Offset (%" CURL_FORMAT_CURL_OFF_T
-	") was beyond file size (%" CURL_FORMAT_CURL_OFF_T ")",
+	failf(data, "Offset (%" FMT_OFF_T
+	") was beyond file size (%" FMT_OFF_T ")",
	data->state.resume_from, size);
	return CURLE_BAD_DOWNLOAD_RESUME;
	}

lib/vssh/libssh2.c+8 -11

@@ -2066,7 +2066,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy data, bool block)
	else {
	curl_off_t size = attrs.filesize;
	if(size < 0) {
-	failf(data, "Bad file size (%" CURL_FORMAT_CURL_OFF_T ")", size);
+	failf(data, "Bad file size (%" FMT_OFF_T ")", size);
	return CURLE_BAD_DOWNLOAD_RESUME;
	}
	data->state.resume_from = attrs.filesize;
@@ -2507,7 +2507,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy data, bool block)
	curl_off_t size = attrs.filesize;

	if(size < 0) {
-	failf(data, "Bad file size (%" CURL_FORMAT_CURL_OFF_T ")", size);
+	failf(data, "Bad file size (%" FMT_OFF_T ")", size);
	return CURLE_BAD_DOWNLOAD_RESUME;
	}
	if(data->state.use_range) {
@@ -2535,10 +2535,8 @@ static CURLcode ssh_statemach_act(struct Curl_easy data, bool block)
	to = size - 1;
	}
	if(from > size) {
-	failf(data, "Offset (%"
-	CURL_FORMAT_CURL_OFF_T ") was beyond file size (%"
-	CURL_FORMAT_CURL_OFF_T ")", from,
-	(curl_off_t)attrs.filesize);
+	failf(data, "Offset (%" FMT_OFF_T ") was beyond file size (%"
+	FMT_OFF_T ")", from, (curl_off_t)attrs.filesize);
	return CURLE_BAD_DOWNLOAD_RESUME;
	}
	if(from > to) {
@@ -2563,9 +2561,8 @@ static CURLcode ssh_statemach_act(struct Curl_easy data, bool block)
	if(data->state.resume_from < 0) {
	/* We are supposed to download the last abs(from) bytes */
	if((curl_off_t)attrs.filesize < -data->state.resume_from) {
-	failf(data, "Offset (%"
-	CURL_FORMAT_CURL_OFF_T ") was beyond file size (%"
-	CURL_FORMAT_CURL_OFF_T ")",
+	failf(data, "Offset (%" FMT_OFF_T ") was beyond file size (%"
+	FMT_OFF_T ")",
	data->state.resume_from, (curl_off_t)attrs.filesize);
	return CURLE_BAD_DOWNLOAD_RESUME;
	}
@@ -2574,8 +2571,8 @@ static CURLcode ssh_statemach_act(struct Curl_easy data, bool block)
	}
	else {
	if((curl_off_t)attrs.filesize < data->state.resume_from) {
-	failf(data, "Offset (%" CURL_FORMAT_CURL_OFF_T
-	") was beyond file size (%" CURL_FORMAT_CURL_OFF_T ")",
+	failf(data, "Offset (%" FMT_OFF_T
+	") was beyond file size (%" FMT_OFF_T ")",
	data->state.resume_from, (curl_off_t)attrs.filesize);
	return CURLE_BAD_DOWNLOAD_RESUME;
	}

lib/vssh/wolfssh.c+3 -3

@@ -281,7 +281,7 @@ static ssize_t wsftp_send(struct Curl_easy *data, int sockindex,
	return -1;
	}
	DEBUGASSERT(rc == (int)len);
-	infof(data, "sent %zu bytes SFTP from offset %" CURL_FORMAT_CURL_OFF_T,
+	infof(data, "sent %zu bytes SFTP from offset %" FMT_OFF_T,
	len, sshc->offset);
	sshc->offset += len;
	return (ssize_t)rc;
@@ -578,7 +578,7 @@ static CURLcode wssh_statemach_act(struct Curl_easy data, bool block)
	else {
	curl_off_t size = ((curl_off_t)attrs.sz[1] << 32) \| attrs.sz[0];
	if(size < 0) {
-	failf(data, "Bad file size (%" CURL_FORMAT_CURL_OFF_T ")", size);
+	failf(data, "Bad file size (%" FMT_OFF_T ")", size);
	return CURLE_BAD_DOWNLOAD_RESUME;
	}
	data->state.resume_from = size;
@@ -769,7 +769,7 @@ static CURLcode wssh_statemach_act(struct Curl_easy data, bool block)
	data->req.maxdownload = size;
	Curl_pgrsSetDownloadSize(data, size);

-	infof(data, "SFTP download %" CURL_FORMAT_CURL_OFF_T " bytes", size);
+	infof(data, "SFTP download %" FMT_OFF_T " bytes", size);

	/* We cannot seek with wolfSSH so resuming and range requests are not
	possible */

lib/vtls/rustls.c+2 -2

@@ -856,8 +856,8 @@ cr_connect_common(struct Curl_cfilter *cf,
	return CURLE_SSL_CONNECT_ERROR;
	}
	if(blocking && 0 == what) {
-	failf(data, "rustls: connection timeout after %"
-	CURL_FORMAT_TIMEDIFF_T " ms", socket_check_timeout);
+	failf(data, "rustls: connection timeout after %" FMT_TIMEDIFF_T " ms",
+	socket_check_timeout);
	return CURLE_OPERATION_TIMEDOUT;
	}
	if(0 == what) {

lib/vtls/vtls.c+4 -4

@@ -784,13 +784,13 @@ void Curl_ssl_adjust_pollset(struct Curl_cfilter cf, struct Curl_easy data,
	if(sock != CURL_SOCKET_BAD) {
	if(connssl->io_need & CURL_SSL_IO_NEED_SEND) {
	Curl_pollset_set_out_only(data, ps, sock);
-	CURL_TRC_CF(data, cf, "adjust_pollset, POLLOUT fd=%"
-	CURL_FORMAT_SOCKET_T, sock);
+	CURL_TRC_CF(data, cf, "adjust_pollset, POLLOUT fd=%" FMT_SOCKET_T,
+	sock);
	}
	else {
	Curl_pollset_set_in_only(data, ps, sock);
-	CURL_TRC_CF(data, cf, "adjust_pollset, POLLIN fd=%"
-	CURL_FORMAT_SOCKET_T, sock);
+	CURL_TRC_CF(data, cf, "adjust_pollset, POLLIN fd=%" FMT_SOCKET_T,
+	sock);
	}
	}
	}

lib/ws.c+8 -9

@@ -128,7 +128,7 @@ static void ws_dec_info(struct ws_decoder dec, struct Curl_easy data,
	}
	else {
	CURL_TRC_WRITE(data, "websocket, decoded %s [%s%s payload=%"
-	CURL_FORMAT_CURL_OFF_T "/%" CURL_FORMAT_CURL_OFF_T "]",
+	FMT_OFF_T "/%" FMT_OFF_T "]",
	msg, ws_frame_name_of_op(dec->head[0]),
	(dec->head[0] & WSBIT_FIN)? "" : " NON-FINAL",
	dec->payload_offset, dec->payload_len);
@@ -282,7 +282,7 @@ static CURLcode ws_dec_pass_payload(struct ws_decoder *dec,
	dec->payload_offset += (curl_off_t)nwritten;
	remain = dec->payload_len - dec->payload_offset;
	CURL_TRC_WRITE(data, "websocket, passed %zd bytes payload, %"
-	CURL_FORMAT_CURL_OFF_T " remain", nwritten, remain);
+	FMT_OFF_T " remain", nwritten, remain);
	}

	return remain? CURLE_AGAIN : CURLE_OK;
@@ -492,8 +492,7 @@ static const struct Curl_cwtype ws_cw_decode = {
	static void ws_enc_info(struct ws_encoder enc, struct Curl_easy data,
	const char *msg)
	{
-	infof(data, "WS-ENC: %s [%s%s%s payload=%" CURL_FORMAT_CURL_OFF_T
-	"/%" CURL_FORMAT_CURL_OFF_T "]",
+	infof(data, "WS-ENC: %s [%s%s%s payload=%" FMT_OFF_T "/%" FMT_OFF_T "]",
	msg, ws_frame_name_of_op(enc->firstbyte),
	(enc->firstbyte & WSBIT_OPCODE_MASK) == WSBIT_OPCODE_CONT ?
	" CONT" : "",
@@ -551,7 +550,7 @@ static ssize_t ws_enc_write_head(struct Curl_easy *data,

	if(payload_len < 0) {
	failf(data, "WS: starting new frame with negative payload length %"
-	CURL_FORMAT_CURL_OFF_T, payload_len);
+	FMT_OFF_T, payload_len);
	*err = CURLE_SEND_ERROR;
	return -1;
	}
@@ -1006,7 +1005,7 @@ CURL_EXTERN CURLcode curl_ws_recv(struct Curl_easy data, void buffer,
	*metap = &ws->frame;
	*nread = ws->frame.len;
	CURL_TRC_WS(data, "curl_ws_recv(len=%zu) -> %zu bytes (frame at %"
-	CURL_FORMAT_CURL_OFF_T ", %" CURL_FORMAT_CURL_OFF_T " left)",
+	FMT_OFF_T ", %" FMT_OFF_T " left)",
	buflen, *nread, ws->frame.offset, ws->frame.bytesleft);
	return CURLE_OK;
	}
@@ -1137,7 +1136,7 @@ CURL_EXTERN CURLcode curl_ws_send(CURL data, const void buffer,
	size_t space, payload_added;
	CURLcode result;

-	CURL_TRC_WS(data, "curl_ws_send(len=%zu, fragsize=%" CURL_FORMAT_CURL_OFF_T
+	CURL_TRC_WS(data, "curl_ws_send(len=%zu, fragsize=%" FMT_OFF_T
	", flags=%x), raw=%d",
	buflen, fragsize, flags, data->set.ws_raw_mode);
	*sent = 0;
@@ -1193,7 +1192,7 @@ CURL_EXTERN CURLcode curl_ws_send(CURL data, const void buffer,
	else {
	if((curl_off_t)buflen > ws->enc.payload_remain) {
	infof(data, "WS: unaligned frame size (sending %zu instead of %"
-	CURL_FORMAT_CURL_OFF_T ")",
+	FMT_OFF_T ")",
	buflen, ws->enc.payload_remain);
	}
	}
@@ -1258,7 +1257,7 @@ CURL_EXTERN CURLcode curl_ws_send(CURL data, const void buffer,
	}

	out:
-	CURL_TRC_WS(data, "curl_ws_send(len=%zu, fragsize=%" CURL_FORMAT_CURL_OFF_T
+	CURL_TRC_WS(data, "curl_ws_send(len=%zu, fragsize=%" FMT_OFF_T
	", flags=%x, raw=%d) -> %d, %zu",
	buflen, fragsize, flags, data->set.ws_raw_mode, result, *sent);
	return result;

tests/server/mqttd.c+3 -3

@@ -766,11 +766,11 @@ static bool incoming(curl_socket_t listenfd)
	curl_socket_t newfd = accept(sockfd, NULL, NULL);
	if(CURL_SOCKET_BAD == newfd) {
	error = SOCKERRNO;
-	logmsg("accept(%" CURL_FORMAT_SOCKET_T ", NULL, NULL) "
+	logmsg("accept(%" FMT_SOCKET_T ", NULL, NULL) "
	"failed with error: (%d) %s", sockfd, error, sstrerror(error));
	}
	else {
-	logmsg("====> Client connect, fd %" CURL_FORMAT_SOCKET_T ". "
+	logmsg("====> Client connect, fd %" FMT_SOCKET_T ". "
	"Read config from %s", newfd, configfile);
	set_advisor_read_lock(loglockfile);
	(void)mqttit(newfd); /* until done */
@@ -909,7 +909,7 @@ static curl_socket_t sockdaemon(curl_socket_t sock,
	rc = listen(sock, 5);
	if(0 != rc) {
	error = SOCKERRNO;
-	logmsg("listen(%" CURL_FORMAT_SOCKET_T ", 5) failed with error: (%d) %s",
+	logmsg("listen(%" FMT_SOCKET_T ", 5) failed with error: (%d) %s",
	sock, error, sstrerror(error));
	sclose(sock);
	return CURL_SOCKET_BAD;

tests/server/sockfilt.c+2 -2

@@ -1155,7 +1155,7 @@ static bool juggle(curl_socket_t *sockfdp,
	curl_socket_t newfd = accept(sockfd, NULL, NULL);
	if(CURL_SOCKET_BAD == newfd) {
	error = SOCKERRNO;
-	logmsg("accept(%" CURL_FORMAT_SOCKET_T ", NULL, NULL) "
+	logmsg("accept(%" FMT_SOCKET_T ", NULL, NULL) "
	"failed with error: (%d) %s", sockfd, error, sstrerror(error));
	}
	else {
@@ -1331,7 +1331,7 @@ static curl_socket_t sockdaemon(curl_socket_t sock,
	rc = listen(sock, 5);
	if(0 != rc) {
	error = SOCKERRNO;
-	logmsg("listen(%" CURL_FORMAT_SOCKET_T ", 5) failed with error: (%d) %s",
+	logmsg("listen(%" FMT_SOCKET_T ", 5) failed with error: (%d) %s",
	sock, error, sstrerror(error));
	sclose(sock);
	return CURL_SOCKET_BAD;

tests/server/socksd.c+3 -3

@@ -751,13 +751,13 @@ static bool incoming(curl_socket_t listenfd)
	curl_socket_t newfd = accept(sockfd, NULL, NULL);
	if(CURL_SOCKET_BAD == newfd) {
	error = SOCKERRNO;
-	logmsg("accept(%" CURL_FORMAT_SOCKET_T ", NULL, NULL) "
+	logmsg("accept(%" FMT_SOCKET_T ", NULL, NULL) "
	"failed with error: (%d) %s",
	sockfd, error, sstrerror(error));
	}
	else {
	curl_socket_t remotefd;
-	logmsg("====> Client connect, fd %" CURL_FORMAT_SOCKET_T ". "
+	logmsg("====> Client connect, fd %" FMT_SOCKET_T ". "
	"Read config from %s", newfd, configfile);
	remotefd = sockit(newfd); /* SOCKS until done */
	if(remotefd == CURL_SOCKET_BAD) {
@@ -941,7 +941,7 @@ static curl_socket_t sockdaemon(curl_socket_t sock,
	rc = listen(sock, 5);
	if(0 != rc) {
	error = SOCKERRNO;
-	logmsg("listen(%" CURL_FORMAT_SOCKET_T ", 5) failed with error: (%d) %s",
+	logmsg("listen(%" FMT_SOCKET_T ", 5) failed with error: (%d) %s",
	sock, error, sstrerror(error));
	sclose(sock);
	return CURL_SOCKET_BAD;

tests/server/sws.c+2 -2

@@ -2331,8 +2331,8 @@ int main(int argc, char *argv[])
	curl_socket_t msgsock;
	do {
	msgsock = accept_connection(sock);
-	logmsg("accept_connection %" CURL_FORMAT_SOCKET_T
-	" returned %" CURL_FORMAT_SOCKET_T, sock, msgsock);
+	logmsg("accept_connection %" FMT_SOCKET_T
+	" returned %" FMT_SOCKET_T, sock, msgsock);
	if(CURL_SOCKET_BAD == msgsock)
	goto sws_cleanup;
	if(req->delay)