mirror of
https://github.com/curl/curl.git
synced 2024-12-21 06:50:10 +08:00
3829759bd0
https://best.openssf.org/Compiler-Hardening-Guides/Compiler-Options-Hardening-Guide-for-C-and-C++.html as of 2023-11-29 [1]. Enable new recommended warnings (except `-Wsign-conversion`): - enable `-Wformat=2` for clang (in both cmake and autotools). - add `CURL_PRINTF()` internal attribute and mark functions accepting printf arguments with it. This is a copy of existing `CURL_TEMP_PRINTF()` but using `__printf__` to make it compatible with redefinting the `printf` symbol: https://gcc.gnu.org/onlinedocs/gcc-3.0.4/gcc_5.html#SEC94 - fix `CURL_PRINTF()` and existing `CURL_TEMP_PRINTF()` for mingw-w64 and enable it on this platform. - enable `-Wimplicit-fallthrough`. - enable `-Wtrampolines`. - add `-Wsign-conversion` commented with a FIXME. - cmake: enable `-pedantic-errors` the way we do it with autotools. Follow-up tod5c0351055#2747 - lib/curl_trc.h: use `CURL_FORMAT()`, this also fixes it to enable format checks. Previously it was always disabled due to the internal `printf` macro. Fix them: - fix bug where an `set_ipv6_v6only()` call was missed in builds with `--disable-verbose` / `CURL_DISABLE_VERBOSE_STRINGS=ON`. - add internal `FALLTHROUGH()` macro. - replace obsolete fall-through comments with `FALLTHROUGH()`. - fix fallthrough markups: Delete redundant ones (showing up as warnings in most cases). Add missing ones. Fix indentation. - silence `-Wformat-nonliteral` warnings with llvm/clang. - fix one `-Wformat-nonliteral` warning. - fix new `-Wformat` and `-Wformat-security` warnings. - fix `CURL_FORMAT_SOCKET_T` value for mingw-w64. Also move its definition to `lib/curl_setup.h` allowing use in `tests/server`. - lib: fix two wrongly passed string arguments in log outputs. Co-authored-by: Jay Satiro - fix new `-Wformat` warnings on mingw-w64. [1]56c0fde389/docs/Compiler-Hardening-Guides/Compiler-Options-Hardening-Guide-for-C-and-C%2B%2B.mdCloses #12489
128 lines
4.0 KiB
C
128 lines
4.0 KiB
C
#ifndef HEADER_CURL_TRC_H
|
|
#define HEADER_CURL_TRC_H
|
|
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at https://curl.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
***************************************************************************/
|
|
|
|
struct Curl_easy;
|
|
struct Curl_cfilter;
|
|
|
|
/**
|
|
* Init logging, return != 0 on failure.
|
|
*/
|
|
CURLcode Curl_trc_init(void);
|
|
|
|
/**
|
|
* Configure tracing. May be called several times during global
|
|
* initialization. Later calls may not take effect.
|
|
*
|
|
* Configuration format supported:
|
|
* - comma-separated list of component names to enable logging on.
|
|
* E.g. 'http/2,ssl'. Unknown names are ignored. Names are compared
|
|
* case-insensitive.
|
|
* - component 'all' applies to all known log components
|
|
* - prefixing a component with '+' or '-' will en-/disable logging for
|
|
* that component
|
|
* Example: 'all,-ssl' would enable logging for all components but the
|
|
* SSL filters.
|
|
*
|
|
* @param config configuration string
|
|
*/
|
|
CURLcode Curl_trc_opt(const char *config);
|
|
|
|
/* the function used to output verbose information */
|
|
void Curl_debug(struct Curl_easy *data, curl_infotype type,
|
|
char *ptr, size_t size);
|
|
|
|
/**
|
|
* Output a failure message on registered callbacks for transfer.
|
|
*/
|
|
void Curl_failf(struct Curl_easy *data,
|
|
const char *fmt, ...) CURL_PRINTF(2, 3);
|
|
|
|
#define failf Curl_failf
|
|
|
|
#define CURL_LOG_LVL_NONE 0
|
|
#define CURL_LOG_LVL_INFO 1
|
|
|
|
|
|
#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
|
|
#define CURL_HAVE_C99
|
|
#endif
|
|
|
|
#ifdef CURL_HAVE_C99
|
|
#define infof(data, ...) \
|
|
do { if(Curl_trc_is_verbose(data)) \
|
|
Curl_infof(data, __VA_ARGS__); } while(0)
|
|
#define CURL_TRC_CF(data, cf, ...) \
|
|
do { if(Curl_trc_cf_is_verbose(cf, data)) \
|
|
Curl_trc_cf_infof(data, cf, __VA_ARGS__); } while(0)
|
|
|
|
#else
|
|
#define infof Curl_infof
|
|
#define CURL_TRC_CF Curl_trc_cf_infof
|
|
#endif
|
|
|
|
#ifndef CURL_DISABLE_VERBOSE_STRINGS
|
|
/* informational messages enabled */
|
|
|
|
#define Curl_trc_is_verbose(data) ((data) && (data)->set.verbose)
|
|
#define Curl_trc_cf_is_verbose(cf, data) \
|
|
((data) && (data)->set.verbose && \
|
|
(cf) && (cf)->cft->log_level >= CURL_LOG_LVL_INFO)
|
|
|
|
/**
|
|
* Output an informational message when transfer's verbose logging is enabled.
|
|
*/
|
|
void Curl_infof(struct Curl_easy *data,
|
|
const char *fmt, ...) CURL_PRINTF(2, 3);
|
|
|
|
/**
|
|
* Output an informational message when both transfer's verbose logging
|
|
* and connection filters verbose logging are enabled.
|
|
*/
|
|
void Curl_trc_cf_infof(struct Curl_easy *data, struct Curl_cfilter *cf,
|
|
const char *fmt, ...) CURL_PRINTF(3, 4);
|
|
|
|
#else /* defined(CURL_DISABLE_VERBOSE_STRINGS) */
|
|
/* All informational messages are not compiled in for size savings */
|
|
|
|
#define Curl_trc_is_verbose(d) ((void)(d), FALSE)
|
|
#define Curl_trc_cf_is_verbose(x,y) ((void)(x), (void)(y), FALSE)
|
|
|
|
static void Curl_infof(struct Curl_easy *data, const char *fmt, ...)
|
|
{
|
|
(void)data; (void)fmt;
|
|
}
|
|
|
|
static void Curl_trc_cf_infof(struct Curl_easy *data,
|
|
struct Curl_cfilter *cf,
|
|
const char *fmt, ...)
|
|
{
|
|
(void)data; (void)cf; (void)fmt;
|
|
}
|
|
|
|
#endif /* !defined(CURL_DISABLE_VERBOSE_STRINGS) */
|
|
|
|
#endif /* HEADER_CURL_TRC_H */
|