lib/libssh2
1
0
Fork 0
mirror of https://github.com/libssh2/libssh2.git synced 2026-10-24 03:48:58 +03:00
Code Activity

tidy-up: C nits

Browse Source 
- drop redundant `== -1` to match rest of code.
- sync outlier pattern to init `struct string_buf` `dataptr`, to drop
  repeat code and casts.
- drop redundant parentheses.
- add const to casts where missing.

Closes #2437
This commit is contained in:
Viktor Szakats
2026-07-24 23:29:30 +02:00
parent d0ca946dee
commit 9921aeff2f
31 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
example/direct_tcpip.c
View File

@@ -125,7 +125,7 @@ int main(int argc, char *argv[])
goto shutdown;
}
sin.sin_port = htons(22);
if(connect(sock, (struct sockaddr *)(&sin), sizeof(struct sockaddr_in))) {
if(connect(sock, (struct sockaddr *)&sin, sizeof(struct sockaddr_in))) {
fprintf(stderr, "Failed to connect to %s.\n", inet_ntoa(sin.sin_addr));
goto shutdown;
}

2
example/scp.c
View File

@@ -85,7 +85,7 @@ int main(int argc, char *argv[])
sin.sin_family = AF_INET;
sin.sin_port = htons(22);
sin.sin_addr.s_addr = hostaddr;
if(connect(sock, (struct sockaddr *)(&sin), sizeof(struct sockaddr_in))) {
if(connect(sock, (struct sockaddr *)&sin, sizeof(struct sockaddr_in))) {
fprintf(stderr, "failed to connect.\n");
goto shutdown;
}

2
example/scp_nonblock.c
View File

@@ -149,7 +149,7 @@ int main(int argc, char *argv[])
sin.sin_family = AF_INET;
sin.sin_port = htons(22);
sin.sin_addr.s_addr = hostaddr;
if(connect(sock, (struct sockaddr *)(&sin), sizeof(struct sockaddr_in))) {
if(connect(sock, (struct sockaddr *)&sin, sizeof(struct sockaddr_in))) {
fprintf(stderr, "failed to connect.\n");
goto shutdown;
}

2
example/scp_write.c
View File

@@ -107,7 +107,7 @@ int main(int argc, char *argv[])
sin.sin_family = AF_INET;
sin.sin_port = htons(22);
sin.sin_addr.s_addr = hostaddr;
if(connect(sock, (struct sockaddr *)(&sin), sizeof(struct sockaddr_in))) {
if(connect(sock, (struct sockaddr *)&sin, sizeof(struct sockaddr_in))) {
fprintf(stderr, "failed to connect.\n");
goto shutdown;
}

2
example/scp_write_nonblock.c
View File

@@ -155,7 +155,7 @@ int main(int argc, char *argv[])
sin.sin_family = AF_INET;
sin.sin_port = htons(22);
sin.sin_addr.s_addr = hostaddr;
if(connect(sock, (struct sockaddr *)(&sin), sizeof(struct sockaddr_in))) {
if(connect(sock, (struct sockaddr *)&sin, sizeof(struct sockaddr_in))) {
fprintf(stderr, "failed to connect.\n");
goto shutdown;
}

2
example/sftp.c
View File

@@ -143,7 +143,7 @@ int main(int argc, char *argv[])
sin.sin_family = AF_INET;
sin.sin_port = htons(22);
sin.sin_addr.s_addr = hostaddr;
if(connect(sock, (struct sockaddr *)(&sin), sizeof(struct sockaddr_in))) {
if(connect(sock, (struct sockaddr *)&sin, sizeof(struct sockaddr_in))) {
fprintf(stderr, "failed to connect.\n");
goto shutdown;
}

2
example/sftp_RW_nonblock.c
View File

@@ -135,7 +135,7 @@ int main(int argc, char *argv[])
sin.sin_family = AF_INET;
sin.sin_port = htons(22);
sin.sin_addr.s_addr = htonl(0x7F000001);
if(connect(sock, (struct sockaddr *)(&sin), sizeof(struct sockaddr_in))) {
if(connect(sock, (struct sockaddr *)&sin, sizeof(struct sockaddr_in))) {
fprintf(stderr, "failed to connect.\n");
goto shutdown;
}

2
example/sftp_append.c
View File

@@ -102,7 +102,7 @@ int main(int argc, char *argv[])
sin.sin_family = AF_INET;
sin.sin_port = htons(22);
sin.sin_addr.s_addr = hostaddr;
if(connect(sock, (struct sockaddr *)(&sin), sizeof(struct sockaddr_in))) {
if(connect(sock, (struct sockaddr *)&sin, sizeof(struct sockaddr_in))) {
fprintf(stderr, "failed to connect.\n");
goto shutdown;
}

2
example/sftp_mkdir.c
View File

@@ -86,7 +86,7 @@ int main(int argc, char *argv[])
sin.sin_family = AF_INET;
sin.sin_port = htons(22);
sin.sin_addr.s_addr = hostaddr;
if(connect(sock, (struct sockaddr *)(&sin), sizeof(struct sockaddr_in))) {
if(connect(sock, (struct sockaddr *)&sin, sizeof(struct sockaddr_in))) {
fprintf(stderr, "failed to connect.\n");
goto shutdown;
}

2
example/sftp_mkdir_nonblock.c
View File

@@ -86,7 +86,7 @@ int main(int argc, char *argv[])
sin.sin_family = AF_INET;
sin.sin_port = htons(22);
sin.sin_addr.s_addr = hostaddr;
if(connect(sock, (struct sockaddr *)(&sin), sizeof(struct sockaddr_in))) {
if(connect(sock, (struct sockaddr *)&sin, sizeof(struct sockaddr_in))) {
fprintf(stderr, "failed to connect.\n");
goto shutdown;
}

2
example/sftp_nonblock.c
View File

@@ -150,7 +150,7 @@ int main(int argc, char *argv[])
sin.sin_family = AF_INET;
sin.sin_port = htons(22);
sin.sin_addr.s_addr = hostaddr;
if(connect(sock, (struct sockaddr *)(&sin), sizeof(struct sockaddr_in))) {
if(connect(sock, (struct sockaddr *)&sin, sizeof(struct sockaddr_in))) {
fprintf(stderr, "failed to connect.\n");
goto shutdown;
}

2
example/sftp_write.c
View File

@@ -101,7 +101,7 @@ int main(int argc, char *argv[])
sin.sin_family = AF_INET;
sin.sin_port = htons(22);
sin.sin_addr.s_addr = hostaddr;
if(connect(sock, (struct sockaddr *)(&sin), sizeof(struct sockaddr_in))) {
if(connect(sock, (struct sockaddr *)&sin, sizeof(struct sockaddr_in))) {
fprintf(stderr, "failed to connect.\n");
goto shutdown;
}

2
example/sftp_write_nonblock.c
View File

@@ -148,7 +148,7 @@ int main(int argc, char *argv[])
sin.sin_family = AF_INET;
sin.sin_port = htons(22);
sin.sin_addr.s_addr = hostaddr;
if(connect(sock, (struct sockaddr *)(&sin), sizeof(struct sockaddr_in))) {
if(connect(sock, (struct sockaddr *)&sin, sizeof(struct sockaddr_in))) {
fprintf(stderr, "failed to connect.\n");
goto shutdown;
}

2
example/sftp_write_sliding.c
View File

@@ -149,7 +149,7 @@ int main(int argc, char *argv[])
sin.sin_family = AF_INET;
sin.sin_port = htons(22);
sin.sin_addr.s_addr = hostaddr;
if(connect(sock, (struct sockaddr *)(&sin), sizeof(struct sockaddr_in))) {
if(connect(sock, (struct sockaddr *)&sin, sizeof(struct sockaddr_in))) {
fprintf(stderr, "failed to connect.\n");
goto shutdown;
}

2
example/sftpdir.c
View File

@@ -118,7 +118,7 @@ int main(int argc, char *argv[])
sin.sin_family = AF_INET;
sin.sin_port = htons(22);
sin.sin_addr.s_addr = hostaddr;
if(connect(sock, (struct sockaddr *)(&sin), sizeof(struct sockaddr_in))) {
if(connect(sock, (struct sockaddr *)&sin, sizeof(struct sockaddr_in))) {
fprintf(stderr, "failed to connect.\n");
goto shutdown;
}

2
example/sftpdir_nonblock.c
View File

@@ -93,7 +93,7 @@ int main(int argc, char *argv[])
sin.sin_family = AF_INET;
sin.sin_port = htons(22);
sin.sin_addr.s_addr = hostaddr;
if(connect(sock, (struct sockaddr *)(&sin), sizeof(struct sockaddr_in))) {
if(connect(sock, (struct sockaddr *)&sin, sizeof(struct sockaddr_in))) {
fprintf(stderr, "failed to connect.\n");
goto shutdown;
}

2
example/ssh2.c
View File

@@ -117,7 +117,7 @@ int main(int argc, char *argv[])
fprintf(stderr, "Connecting to %s:%d as user %s\n",
inet_ntoa(sin.sin_addr), ntohs(sin.sin_port), username);
if(connect(sock, (struct sockaddr *)(&sin), sizeof(struct sockaddr_in))) {
if(connect(sock, (struct sockaddr *)&sin, sizeof(struct sockaddr_in))) {
fprintf(stderr, "failed to connect.\n");
goto shutdown;
}

2
example/ssh2_agent.c
View File

@@ -80,7 +80,7 @@ int main(int argc, char *argv[])
sin.sin_family = AF_INET;
sin.sin_port = htons(22);
sin.sin_addr.s_addr = hostaddr;
if(connect(sock, (struct sockaddr *)(&sin), sizeof(struct sockaddr_in))) {
if(connect(sock, (struct sockaddr *)&sin, sizeof(struct sockaddr_in))) {
fprintf(stderr, "failed to connect.\n");
goto shutdown;
}

2
example/ssh2_agent_forwarding.c
View File

@@ -134,7 +134,7 @@ int main(int argc, char *argv[])
sin.sin_family = AF_INET;
sin.sin_port = htons(22);
sin.sin_addr.s_addr = hostaddr;
if(connect(sock, (struct sockaddr *)(&sin), sizeof(struct sockaddr_in))) {
if(connect(sock, (struct sockaddr *)&sin, sizeof(struct sockaddr_in))) {
fprintf(stderr, "failed to connect.\n");
goto shutdown;
}

2
example/ssh2_echo.c
View File

@@ -132,7 +132,7 @@ int main(int argc, char *argv[])
sin.sin_family = AF_INET;
sin.sin_port = htons(22);
sin.sin_addr.s_addr = hostaddr;
if(connect(sock, (struct sockaddr *)(&sin), sizeof(struct sockaddr_in))) {
if(connect(sock, (struct sockaddr *)&sin, sizeof(struct sockaddr_in))) {
fprintf(stderr, "failed to connect.\n");
goto shutdown;
}

2
example/ssh2_exec.c
View File

@@ -135,7 +135,7 @@ int main(int argc, char *argv[])
sin.sin_family = AF_INET;
sin.sin_port = htons(22);
sin.sin_addr.s_addr = hostaddr;
if(connect(sock, (struct sockaddr *)(&sin), sizeof(struct sockaddr_in))) {
if(connect(sock, (struct sockaddr *)&sin, sizeof(struct sockaddr_in))) {
fprintf(stderr, "failed to connect.\n");
goto shutdown;
}

2
example/subsystem_netconf.c
View File

@@ -149,7 +149,7 @@ int main(int argc, char *argv[])
goto shutdown;
}
sin.sin_port = htons(830);
if(connect(sock, (struct sockaddr *)(&sin), sizeof(struct sockaddr_in))) {
if(connect(sock, (struct sockaddr *)&sin, sizeof(struct sockaddr_in))) {
fprintf(stderr, "Failed to connect to %s.\n", inet_ntoa(sin.sin_addr));
goto shutdown;
}

2
example/tcpip-forward.c
View File

@@ -123,7 +123,7 @@ int main(int argc, char *argv[])
goto shutdown;
}
sin.sin_port = htons(22);
if(connect(sock, (struct sockaddr *)(&sin), sizeof(struct sockaddr_in))) {
if(connect(sock, (struct sockaddr *)&sin, sizeof(struct sockaddr_in))) {
fprintf(stderr, "Failed to connect to %s.\n", inet_ntoa(sin.sin_addr));
goto shutdown;
}

2
example/x11.c
View File

@@ -340,7 +340,7 @@ int main(int argc, char *argv[])
sin.sin_port = htons((unsigned short)port);
sin.sin_addr.s_addr = hostaddr;
if(connect(sock, (struct sockaddr *)(&sin), sizeof(struct sockaddr_in))) {
if(connect(sock, (struct sockaddr *)&sin, sizeof(struct sockaddr_in))) {
fprintf(stderr, "Failed to establish connection.\n");
return 1;
}

2
src/agent.c
View File

@@ -599,7 +599,7 @@ static int agent_connect_unix(LIBSSH2_AGENT *agent)
memcpy(s_un.sun_path, path, plen);
s_un.sun_path[plen] = '\0';
if(connect(agent->fd, (struct sockaddr *)(&s_un), sizeof(s_un)) != 0) {
if(connect(agent->fd, (struct sockaddr *)&s_un, sizeof(s_un)) != 0) {
close(agent->fd);
return ssh2_err(agent->session, LIBSSH2_ERROR_AGENT_PROTOCOL,
"failed connecting with agent");

3
src/packet.c
View File

@@ -626,7 +626,6 @@ int ssh2_packet_add(LIBSSH2_SESSION *session, unsigned char *data,
SSH2_MACERROR(session, (char *)data, datalen))) {
/* Bad MAC input, but no callback set or non-zero return from the
callback */
SSH2_FREE(session, data);
return ssh2_err(session, LIBSSH2_ERROR_INVALID_MAC,
"Invalid MAC received");
@@ -1328,7 +1327,7 @@ ssh2_packet_add_jump_authagent:
if((msg == SSH_MSG_KEXINIT &&
!(session->state & SSH2_STATE_EXCHANGING_KEYS)) ||
(session->packAdd_state == ssh2_NB_state_sent2)) {
session->packAdd_state == ssh2_NB_state_sent2) {
if(session->packAdd_state == ssh2_NB_state_sent1) {
/*

2
src/pem.c
View File

@@ -459,7 +459,7 @@ static int pem_parse_data_openssh(LIBSSH2_SESSION *session,
}
else {
kdf_buf.data = kdf;
kdf_buf.dataptr = kdf;
kdf_buf.dataptr = kdf_buf.data;
kdf_buf.len = kdf_len;
}

2
src/publickey.c
View File

@@ -184,7 +184,7 @@ static int publickey_response_id(unsigned char **pdata, size_t data_len)
while(codes->name) {
if((unsigned long)codes->name_len == response_len &&
!strncmp(codes->name, (char *)data, response_len)) {
!strncmp(codes->name, (const char *)data, response_len)) {
*pdata = data + response_len;
return codes->code;
}

2
src/sftp.c
View File

@@ -963,7 +963,7 @@ static LIBSSH2_SFTP *sftp_init(LIBSSH2_SESSION *session)
SSH2_FREE(session, extversion_str);
}
if(extname_len == 24 &&
!strncmp("posix-rename@openssh.com", (char *)extname, 24)) {
!strncmp("posix-rename@openssh.com", (const char *)extname, 24)) {
sftp_handle->posix_rename_version = extversion;
}
}

14
src/userauth_kbd_packet.c
View File

@@ -44,7 +44,7 @@ int userauth_keyboard_interactive_decode_info_request(LIBSSH2_SESSION *session)
struct string_buf decoded;
decoded.data = session->userauth_kybd_data;
decoded.dataptr = session->userauth_kybd_data;
decoded.dataptr = decoded.data;
decoded.len = session->userauth_kybd_data_len;
if(session->userauth_kybd_data_len < 17) {
@@ -59,7 +59,7 @@ int userauth_keyboard_interactive_decode_info_request(LIBSSH2_SESSION *session)
/* string name (ISO-10646 UTF-8) */
if(ssh2_copy_string(session, &decoded,
&session->userauth_kybd_auth_name,
&session->userauth_kybd_auth_name_len) == -1) {
&session->userauth_kybd_auth_name_len)) {
ssh2_err(session, LIBSSH2_ERROR_ALLOC,
"Unable to decode keyboard-interactive 'name' "
"request field");
@@ -69,7 +69,7 @@ int userauth_keyboard_interactive_decode_info_request(LIBSSH2_SESSION *session)
/* string instruction (ISO-10646 UTF-8) */
if(ssh2_copy_string(session, &decoded,
&session->userauth_kybd_auth_instruction,
&session->userauth_kybd_auth_instruction_len) == -1) {
&session->userauth_kybd_auth_instruction_len)) {
ssh2_err(session, LIBSSH2_ERROR_ALLOC,
"Unable to decode keyboard-interactive 'instruction' "
"request field");
@@ -77,7 +77,7 @@ int userauth_keyboard_interactive_decode_info_request(LIBSSH2_SESSION *session)
}
/* string language tag (as defined in [RFC-3066]) */
if(ssh2_get_string(&decoded, &language_tag, &language_tag_len) == -1) {
if(ssh2_get_string(&decoded, &language_tag, &language_tag_len)) {
ssh2_err(session, LIBSSH2_ERROR_ALLOC,
"Unable to decode keyboard-interactive 'language tag' "
"request field");
@@ -85,7 +85,7 @@ int userauth_keyboard_interactive_decode_info_request(LIBSSH2_SESSION *session)
}
/* int num-prompts */
if(ssh2_get_u32(&decoded, &tmp_u32) == -1) {
if(ssh2_get_u32(&decoded, &tmp_u32)) {
ssh2_err(session, LIBSSH2_ERROR_BUFFER_TOO_SMALL,
"Unable to decode "
"keyboard-interactive number of keyboard prompts");
@@ -134,7 +134,7 @@ int userauth_keyboard_interactive_decode_info_request(LIBSSH2_SESSION *session)
/* string prompt[1] (ISO-10646 UTF-8) */
if(ssh2_copy_string(session, &decoded,
&session->userauth_kybd_prompts[i].text,
&session->userauth_kybd_prompts[i].length) == -1) {
&session->userauth_kybd_prompts[i].length)) {
ssh2_err(session, LIBSSH2_ERROR_ALLOC,
"Unable to decode keyboard-interactive prompt message");
return -1;
@@ -142,7 +142,7 @@ int userauth_keyboard_interactive_decode_info_request(LIBSSH2_SESSION *session)
/* boolean echo[1] */
if(ssh2_get_boolean(&decoded,
&session->userauth_kybd_prompts[i].echo) == -1) {
&session->userauth_kybd_prompts[i].echo)) {
ssh2_err(session, LIBSSH2_ERROR_BUFFER_TOO_SMALL,
"Unable to decode user auth keyboard prompt echo");
return -1;

2
src/wincng.c
View File

@@ -2346,7 +2346,7 @@ static int wcng_ecdsa_new_private_parse(OUT ssh2_ecdsa_ctx **ec_ctx,
}
data_buffer.data = SSH2_UNCONST(privatekey);
data_buffer.dataptr = SSH2_UNCONST(privatekey);
data_buffer.dataptr = data_buffer.data;
data_buffer.len = privatekey_len;
/* Read the 2 checkints and check that they match */