From: Vladimír Čunát Date: Wed, 7 Jun 2023 08:41:22 +0000 (+0200) Subject: treewide: fix -Wstrict-prototypes X-Git-Tag: v5.7.0~4^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a691f49482afbe0e1c88f3da5cc593d34b00576e;p=thirdparty%2Fknot-resolver.git treewide: fix -Wstrict-prototypes --- diff --git a/daemon/lua/kres-gen-30.lua b/daemon/lua/kres-gen-30.lua index 4353c5ce0..bb462fcc2 100644 --- a/daemon/lua/kres-gen-30.lua +++ b/daemon/lua/kres-gen-30.lua @@ -434,7 +434,7 @@ void kr_qflags_clear(struct kr_qflags *, struct kr_qflags); int kr_zonecut_add(struct kr_zonecut *, const knot_dname_t *, const void *, int); _Bool kr_zonecut_is_empty(struct kr_zonecut *); void kr_zonecut_set(struct kr_zonecut *, const knot_dname_t *); -uint64_t kr_now(); +uint64_t kr_now(void); const char *kr_strptime_diff(const char *, const char *, const char *, double *); time_t kr_file_mtime(const char *); long long kr_fssize(const char *); diff --git a/daemon/lua/kres-gen-31.lua b/daemon/lua/kres-gen-31.lua index a68dd653f..b7c31c7cc 100644 --- a/daemon/lua/kres-gen-31.lua +++ b/daemon/lua/kres-gen-31.lua @@ -434,7 +434,7 @@ void kr_qflags_clear(struct kr_qflags *, struct kr_qflags); int kr_zonecut_add(struct kr_zonecut *, const knot_dname_t *, const void *, int); _Bool kr_zonecut_is_empty(struct kr_zonecut *); void kr_zonecut_set(struct kr_zonecut *, const knot_dname_t *); -uint64_t kr_now(); +uint64_t kr_now(void); const char *kr_strptime_diff(const char *, const char *, const char *, double *); time_t kr_file_mtime(const char *); long long kr_fssize(const char *); diff --git a/daemon/lua/kres-gen-32.lua b/daemon/lua/kres-gen-32.lua index 222891e3f..624654d36 100644 --- a/daemon/lua/kres-gen-32.lua +++ b/daemon/lua/kres-gen-32.lua @@ -435,7 +435,7 @@ void kr_qflags_clear(struct kr_qflags *, struct kr_qflags); int kr_zonecut_add(struct kr_zonecut *, const knot_dname_t *, const void *, int); _Bool kr_zonecut_is_empty(struct kr_zonecut *); void kr_zonecut_set(struct kr_zonecut *, const knot_dname_t *); -uint64_t kr_now(); +uint64_t kr_now(void); const char *kr_strptime_diff(const char *, const char *, const char *, double *); time_t kr_file_mtime(const char *); long long kr_fssize(const char *); diff --git a/daemon/tls.c b/daemon/tls.c index 355aae26e..2e1631b97 100644 --- a/daemon/tls.c +++ b/daemon/tls.c @@ -834,7 +834,7 @@ void tls_client_params_free(tls_client_params_t *params) trie_free(params); } -tls_client_param_t * tls_client_param_new() +tls_client_param_t * tls_client_param_new(void) { tls_client_param_t *e = calloc(1, sizeof(*e)); if (kr_fails_assert(e)) diff --git a/daemon/tls.h b/daemon/tls.h index 76985d623..af1f5c98e 100644 --- a/daemon/tls.h +++ b/daemon/tls.h @@ -86,7 +86,7 @@ static inline tls_client_param_t * } /** Allocate and initialize the structure (with ->ref = 1). */ -tls_client_param_t * tls_client_param_new(); +tls_client_param_t * tls_client_param_new(void); /** Reference-counted free(); any inside data is freed alongside. */ void tls_client_param_unref(tls_client_param_t *entry); diff --git a/daemon/tls_ephemeral_credentials.c b/daemon/tls_ephemeral_credentials.c index 23b944f62..ff4682f98 100644 --- a/daemon/tls_ephemeral_credentials.c +++ b/daemon/tls_ephemeral_credentials.c @@ -51,7 +51,7 @@ static void _lock_unlock(lock_t *lock, const char *fname) } } -static gnutls_x509_privkey_t get_ephemeral_privkey () +static gnutls_x509_privkey_t get_ephemeral_privkey (void) { gnutls_x509_privkey_t privkey = NULL; int err; diff --git a/daemon/udp_queue.c b/daemon/udp_queue.c index 7460e041c..b8b7a50ad 100644 --- a/daemon/udp_queue.c +++ b/daemon/udp_queue.c @@ -40,7 +40,7 @@ typedef struct { } items[UDP_QUEUE_LEN]; } udp_queue_t; -static udp_queue_t * udp_queue_create() +static udp_queue_t * udp_queue_create(void) { udp_queue_t *q = calloc(1, sizeof(*q)); kr_require(q != NULL); diff --git a/lib/log.c b/lib/log.c index 1a3d71541..9c8c7a6f3 100644 --- a/lib/log.c +++ b/lib/log.c @@ -203,7 +203,7 @@ enum kr_log_group kr_log_name2grp(const char *name) -static void kr_gnutls_log_level_set() +static void kr_gnutls_log_level_set(void) { /* gnutls logs messages related to our TLS and also libdnssec, * and the logging is set up in a global way only */ @@ -238,7 +238,7 @@ void kr_log_group_add(enum kr_log_group group) kr_gnutls_log_level_set(); } -void kr_log_group_reset() +void kr_log_group_reset(void) { bool had_gnutls = kr_log_group_is_set(LOG_GRP_GNUTLS); kr_log_groups = 0; diff --git a/lib/log.h b/lib/log.h index 1a0237a18..64c8bb5dd 100644 --- a/lib/log.h +++ b/lib/log.h @@ -139,7 +139,7 @@ bool kr_log_group_is_set(enum kr_log_group group); KR_EXPORT void kr_log_group_add(enum kr_log_group group); KR_EXPORT -void kr_log_group_reset(); +void kr_log_group_reset(void); KR_EXPORT const char *kr_log_grp2name(enum kr_log_group group); KR_EXPORT diff --git a/lib/module.h b/lib/module.h index 7548803cf..507b2df1c 100644 --- a/lib/module.h +++ b/lib/module.h @@ -22,7 +22,7 @@ struct kr_prop; * @param module module name (e.g. policy) */ #define KR_MODULE_EXPORT(module) \ - KR_EXPORT uint32_t module ## _api() { return KR_MODULE_API; } + KR_EXPORT uint32_t module ## _api(void) { return KR_MODULE_API; } #define KR_MODULE_API ((uint32_t) 0x20210125) typedef uint32_t (module_api_cb)(void); diff --git a/lib/utils.c b/lib/utils.c index 52366e910..8b7e12709 100644 --- a/lib/utils.c +++ b/lib/utils.c @@ -1224,7 +1224,7 @@ char *kr_rrset_text(const knot_rrset_t *rr) return buf; } -uint64_t kr_now() +uint64_t kr_now(void) { return uv_now(uv_default_loop()); } diff --git a/lib/utils.h b/lib/utils.h index 0d1d8456b..1f30e9843 100644 --- a/lib/utils.h +++ b/lib/utils.h @@ -503,7 +503,7 @@ static inline uint16_t kr_rrset_type_maysig(const knot_rrset_t *rr) * \note it may be outdated in case of long callbacks; see uv_now(). */ KR_EXPORT -uint64_t kr_now(); +uint64_t kr_now(void); /** Call free(handle->data); it's useful e.g. as a callback in uv_close(). */ KR_EXPORT void kr_uv_free_cb(uv_handle_t* handle); diff --git a/modules/http/debug_opensslkeylog.c b/modules/http/debug_opensslkeylog.c index 6709eb73f..20699bf9c 100644 --- a/modules/http/debug_opensslkeylog.c +++ b/modules/http/debug_opensslkeylog.c @@ -69,6 +69,7 @@ static int keylog_file_fd = -1; #pragma GCC diagnostic ignored "-Wpedantic" #pragma GCC diagnostic ignored "-Wunused-result" +#pragma GCC diagnostic ignored "-Wstrict-prototypes" static inline void put_hex(char *buffer, int pos, char c) { diff --git a/tests/pytests/proxy/tls-proxy.c b/tests/pytests/proxy/tls-proxy.c index 986716cd1..5c13adf1e 100644 --- a/tests/pytests/proxy/tls-proxy.c +++ b/tests/pytests/proxy/tls-proxy.c @@ -918,7 +918,7 @@ int tls_process_from_client(struct peer *client, const uint8_t *buf, ssize_t nre return submitted; } -struct tls_proxy_ctx *tls_proxy_allocate() +struct tls_proxy_ctx *tls_proxy_allocate(void) { return malloc(sizeof(struct tls_proxy_ctx)); } diff --git a/tests/pytests/proxy/tls-proxy.h b/tests/pytests/proxy/tls-proxy.h index 2dbd9fd81..db52fb768 100644 --- a/tests/pytests/proxy/tls-proxy.h +++ b/tests/pytests/proxy/tls-proxy.h @@ -27,7 +27,7 @@ struct args { struct tls_proxy_ctx; -struct tls_proxy_ctx *tls_proxy_allocate(); +struct tls_proxy_ctx *tls_proxy_allocate(void); void tls_proxy_free(struct tls_proxy_ctx *proxy); int tls_proxy_init(struct tls_proxy_ctx *proxy, const struct args *a); int tls_proxy_start_listen(struct tls_proxy_ctx *proxy); diff --git a/utils/cache_gc/main.c b/utils/cache_gc/main.c index 2e863e6bb..db4f0bd8c 100644 --- a/utils/cache_gc/main.c +++ b/utils/cache_gc/main.c @@ -30,7 +30,7 @@ static void got_killed(int signum) } } -static void print_help() +static void print_help(void) { printf("Usage: kr_cache_gc -c [ optional params... ]\n"); printf("Optional params:\n"); @@ -45,7 +45,7 @@ static void print_help() printf(" -n (= dry run)\n"); } -static long get_nonneg_optarg() +static long get_nonneg_optarg(void) { char *end; const long result = strtol(optarg, &end, 10); diff --git a/utils/client/kresc.c b/utils/client/kresc.c index 16782a130..e08347082 100644 --- a/utils/client/kresc.c +++ b/utils/client/kresc.c @@ -346,7 +346,7 @@ static char *run_cmd(const char *cmd, size_t * out_len) return msg; } -static int interact() +static int interact(void) { EditLine *el; History *hist;