lib/libssh2
1
0
Fork 0
mirror of https://github.com/libssh2/libssh2.git synced 2025-07-31 00:03:08 +03:00
Code Activity

tidy-up: add missing newline to error msg, formatting

Browse Source 
Also:
- fix indent
- lowercase variables names
- fix formatting in `src/global.c`

Cherry-picked from #1017
This commit is contained in:
Viktor Szakats
2023-04-29 12:53:32 +00:00
parent 7c98234790
commit efdacfc791
4 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/global.c
View File

@ -74,5 +74,5 @@ void
_libssh2_init_if_needed(void) _libssh2_init_if_needed(void)
{ {
if(_libssh2_initialized == 0) if(_libssh2_initialized == 0)
(void)libssh2_init (0); (void)libssh2_init(0);
} }

6
tests/openssh_fixture.c
View File

@ -177,8 +177,8 @@ static int build_openssh_server_docker_image(void)
} }
buildcmd[sizeof(buildcmd)-1] = 0; buildcmd[sizeof(buildcmd)-1] = 0;
snprintf(buildcmd, sizeof(buildcmd)-1, snprintf(buildcmd, sizeof(buildcmd)-1,
"docker build --quiet -t libssh2/openssh_server %s", "docker build --quiet -t libssh2/openssh_server %s",
srcdir_path("openssh_server")); srcdir_path("openssh_server"));
return run_command(NULL, buildcmd); return run_command(NULL, buildcmd);
} }
@ -455,7 +455,7 @@ void stop_openssh_fixture(void)
running_container_id = NULL; running_container_id = NULL;
} }
else if(have_docker) { else if(have_docker) {
fprintf(stderr, "Cannot stop container - none started"); fprintf(stderr, "Cannot stop container - none started\n");
} }
} }

18
tests/test_agent_forward_ok.c
View File

@ -1,8 +1,8 @@
#include "runner.h" #include "runner.h"
static const char *USERNAME = "libssh2"; /* set in Dockerfile */ static const char *username = "libssh2"; /* set in Dockerfile */
static const char *KEY_FILE_PRIVATE = "key_rsa"; static const char *key_file_private = "key_rsa";
static const char *KEY_FILE_PUBLIC = "key_rsa.pub"; /* set in Dockerfile */ static const char *key_file_public = "key_rsa.pub"; /* set in Dockerfile */
int test(LIBSSH2_SESSION *session) int test(LIBSSH2_SESSION *session)
{ {
@ -10,8 +10,8 @@ int test(LIBSSH2_SESSION *session)
LIBSSH2_CHANNEL *channel; LIBSSH2_CHANNEL *channel;
const char *userauth_list = const char *userauth_list =
libssh2_userauth_list(session, USERNAME, libssh2_userauth_list(session, username,
(unsigned int)strlen(USERNAME)); (unsigned int)strlen(username));
if(!userauth_list) { if(!userauth_list) {
print_last_session_error("libssh2_userauth_list"); print_last_session_error("libssh2_userauth_list");
return 1; return 1;
@ -23,10 +23,10 @@ int test(LIBSSH2_SESSION *session)
return 1; return 1;
} }
rc = libssh2_userauth_publickey_fromfile_ex(session, USERNAME, rc = libssh2_userauth_publickey_fromfile_ex(session, username,
(unsigned int)strlen(USERNAME), (unsigned int)strlen(username),
srcdir_path(KEY_FILE_PUBLIC), srcdir_path(key_file_public),
srcdir_path(KEY_FILE_PRIVATE), srcdir_path(key_file_private),
NULL); NULL);
if(rc) { if(rc) {
print_last_session_error("libssh2_userauth_publickey_fromfile_ex"); print_last_session_error("libssh2_userauth_publickey_fromfile_ex");

18
tests/test_read.c
View File

@ -5,9 +5,9 @@
#include <stdlib.h> /* for getenv() */ #include <stdlib.h> /* for getenv() */
/* set in Dockerfile */ /* set in Dockerfile */
static const char *USERNAME = "libssh2"; static const char *username = "libssh2";
static const char *KEY_FILE_PRIVATE = "key_rsa"; static const char *key_file_private = "key_rsa";
static const char *KEY_FILE_PUBLIC = "key_rsa.pub"; static const char *key_file_public = "key_rsa.pub";
int test(LIBSSH2_SESSION *session) int test(LIBSSH2_SESSION *session)
{ {
@ -29,8 +29,8 @@ int test(LIBSSH2_SESSION *session)
const char *env; const char *env;
const char *userauth_list = const char *userauth_list =
libssh2_userauth_list(session, USERNAME, libssh2_userauth_list(session, username,
(unsigned int)strlen(USERNAME)); (unsigned int)strlen(username));
if(!userauth_list) { if(!userauth_list) {
print_last_session_error("libssh2_userauth_list"); print_last_session_error("libssh2_userauth_list");
return 1; return 1;
@ -42,10 +42,10 @@ int test(LIBSSH2_SESSION *session)
return 1; return 1;
} }
rc = libssh2_userauth_publickey_fromfile_ex(session, USERNAME, rc = libssh2_userauth_publickey_fromfile_ex(session, username,
(unsigned int)strlen(USERNAME), (unsigned int)strlen(username),
srcdir_path(KEY_FILE_PUBLIC), srcdir_path(key_file_public),
srcdir_path(KEY_FILE_PRIVATE), srcdir_path(key_file_private),
NULL); NULL);
if(rc) { if(rc) {
print_last_session_error("libssh2_userauth_publickey_fromfile_ex"); print_last_session_error("libssh2_userauth_publickey_fromfile_ex");