From 81320d35f3e6d8ca3d64117f05d59b8f54ea838d Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Wed, 12 Oct 2022 13:03:45 +0200 Subject: [PATCH] examples: Fix build issue with new clang 15 The error was the following /builds/libssh/libssh-mirror/examples/sshnetcat.c:241:18: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes] void cleanup_pcap(){ ^ void and similar Signed-off-by: Jakub Jelen Reviewed-by: Anderson Toshiyuki Sasaki (cherry picked from commit 22f0f0dd60907ee7bcf30a5e32638ef12b8f0457) Reviewed-by: Andrew Bartlett --- examples/sshnetcat.c | 5 +++-- src/init.c | 2 +- tests/pkd/pkd_keyutil.c | 24 ++++++++++++------------ 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/examples/sshnetcat.c b/examples/sshnetcat.c index ccc72c86..01851d96 100644 --- a/examples/sshnetcat.c +++ b/examples/sshnetcat.c @@ -233,9 +233,10 @@ void set_pcap(ssh_session session){ } void cleanup_pcap(void); -void cleanup_pcap(){ +void cleanup_pcap(void) +{ ssh_pcap_file_free(pcap); - pcap=NULL; + pcap = NULL; } #endif diff --git a/src/init.c b/src/init.c index 2ebcedf6..c25b213b 100644 --- a/src/init.c +++ b/src/init.c @@ -269,7 +269,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, * * @see ssh_init() */ -bool is_ssh_initialized() { +bool is_ssh_initialized(void) { bool is_initialized = false; diff --git a/tests/pkd/pkd_keyutil.c b/tests/pkd/pkd_keyutil.c index 3991bcbb..533d2788 100644 --- a/tests/pkd/pkd_keyutil.c +++ b/tests/pkd/pkd_keyutil.c @@ -22,7 +22,7 @@ #include "pkd_keyutil.h" #include "pkd_util.h" -void setup_rsa_key() { +void setup_rsa_key(void) { int rc = 0; if (access(LIBSSH_RSA_TESTKEY, F_OK) != 0) { rc = system_checked(OPENSSH_KEYGEN " -t rsa -q -N \"\" -f " @@ -31,7 +31,7 @@ void setup_rsa_key() { assert_int_equal(rc, 0); } -void setup_ed25519_key() { +void setup_ed25519_key(void) { int rc = 0; if (access(LIBSSH_ED25519_TESTKEY, F_OK) != 0) { rc = system_checked(OPENSSH_KEYGEN " -t ed25519 -q -N \"\" -f " @@ -41,7 +41,7 @@ void setup_ed25519_key() { } #ifdef HAVE_DSA -void setup_dsa_key() { +void setup_dsa_key(void) { int rc = 0; if (access(LIBSSH_DSA_TESTKEY, F_OK) != 0) { rc = system_checked(OPENSSH_KEYGEN " -t dsa -q -N \"\" -f " @@ -51,7 +51,7 @@ void setup_dsa_key() { } #endif -void setup_ecdsa_keys() { +void setup_ecdsa_keys(void) { int rc = 0; if (access(LIBSSH_ECDSA_256_TESTKEY, F_OK) != 0) { @@ -71,27 +71,27 @@ void setup_ecdsa_keys() { } } -void cleanup_rsa_key() { +void cleanup_rsa_key(void) { cleanup_key(LIBSSH_RSA_TESTKEY); } -void cleanup_ed25519_key() { +void cleanup_ed25519_key(void) { cleanup_key(LIBSSH_ED25519_TESTKEY); } #ifdef HAVE_DSA -void cleanup_dsa_key() { +void cleanup_dsa_key(void) { cleanup_key(LIBSSH_DSA_TESTKEY); } #endif -void cleanup_ecdsa_keys() { +void cleanup_ecdsa_keys(void) { cleanup_key(LIBSSH_ECDSA_256_TESTKEY); cleanup_key(LIBSSH_ECDSA_384_TESTKEY); cleanup_key(LIBSSH_ECDSA_521_TESTKEY); } -void setup_openssh_client_keys() { +void setup_openssh_client_keys(void) { int rc = 0; if (access(OPENSSH_CA_TESTKEY, F_OK) != 0) { @@ -184,7 +184,7 @@ void setup_openssh_client_keys() { } } -void cleanup_openssh_client_keys() { +void cleanup_openssh_client_keys(void) { cleanup_key(OPENSSH_CA_TESTKEY); cleanup_key(OPENSSH_RSA_TESTKEY); cleanup_file(OPENSSH_RSA_TESTKEY "-sha256-cert.pub"); @@ -199,7 +199,7 @@ void cleanup_openssh_client_keys() { } } -void setup_dropbear_client_rsa_key() { +void setup_dropbear_client_rsa_key(void) { int rc = 0; if (access(DROPBEAR_RSA_TESTKEY, F_OK) != 0) { rc = system_checked(DROPBEAR_KEYGEN " -t rsa -f " @@ -208,6 +208,6 @@ void setup_dropbear_client_rsa_key() { assert_int_equal(rc, 0); } -void cleanup_dropbear_client_rsa_key() { +void cleanup_dropbear_client_rsa_key(void) { unlink(DROPBEAR_RSA_TESTKEY); }