lib/libssh2
1
0
Fork 0
mirror of https://github.com/libssh2/libssh2.git synced 2025-07-29 13:01:14 +03:00
Code Activity

example, tests: address compiler warnings

Browse Source 
Fix or silence all C compiler warnings discovered with (or without)
`PICKY_COMPILER=ON` (in CMake). This means all warnings showing up in
CI (gcc, clang, MSVS 2013/2015), in local tests on macOS (clang 14) and
Windows cross-builds using gcc (12) and llvm/clang (14/15).

Also fix the expression `nread -= nread` in `sftp_RW_nonblock.c`.

Cherry-picked from: #846
Closes #861
This commit is contained in:
Viktor Szakats
2023-03-20 15:46:12 +00:00
parent ec0a51db1f
commit b13936bd6a
47 changed files with 343 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
example/tcpip-forward.c
View File

@ -11,6 +11,8 @@
#include <windows.h>
#include <winsock2.h>
#include <ws2tcpip.h>
#define recv(s, b, l, f) recv((s), (b), (int)(l), (f))
#define send(s, b, l, f) send((s), (b), (int)(l), (f))
#else
#include <sys/socket.h>
#include <netinet/in.h>
@ -157,7 +159,8 @@ int main(int argc, char *argv[])
fprintf(stderr, "\n");
/* check what authentication methods are available */
userauthlist = libssh2_userauth_list(session, username, strlen(username));
userauthlist = libssh2_userauth_list(session, username,
(unsigned int)strlen(username));
fprintf(stderr, "Authentication methods: %s\n", userauthlist);
if(strstr(userauthlist, "password"))
auth |= AUTH_PASSWORD;
@ -251,12 +254,13 @@ int main(int argc, char *argv[])
FD_SET(forwardsock, &fds);
tv.tv_sec = 0;
tv.tv_usec = 100000;
rc = select(forwardsock + 1, &fds, NULL, NULL, &tv);
rc = select((int)(forwardsock + 1), &fds, NULL, NULL, &tv);
if(-1 == rc) {
perror("select");
goto shutdown;
}
if(rc && FD_ISSET(forwardsock, &fds)) {
ssize_t nwritten;
len = recv(forwardsock, buf, sizeof(buf), 0);
if(len < 0) {
perror("read");
@ -269,30 +273,33 @@ int main(int argc, char *argv[])
}
wr = 0;
do {
i = libssh2_channel_write(channel, buf, len);
if(i < 0) {
fprintf(stderr, "libssh2_channel_write: %d\n", i);
nwritten = libssh2_channel_write(channel, buf, len);
if(nwritten < 0) {
fprintf(stderr, "libssh2_channel_write: %d\n",
(int)nwritten);
goto shutdown;
}
wr += i;
} while(i > 0 && wr < len);
wr += nwritten;
} while(nwritten > 0 && wr < len);
}
for(;;) {
ssize_t nsent;
len = libssh2_channel_read(channel, buf, sizeof(buf));
if(LIBSSH2_ERROR_EAGAIN == len)
break;
else if(len < 0) {
fprintf(stderr, "libssh2_channel_read: %d", (int)len);
fprintf(stderr, "libssh2_channel_read: %d",
(int)len);
goto shutdown;
}
wr = 0;
while(wr < len) {
i = send(forwardsock, buf + wr, len - wr, 0);
if(i <= 0) {
nsent = send(forwardsock, buf + wr, len - wr, 0);
if(nsent <= 0) {
perror("write");
goto shutdown;
}
wr += i;
wr += nsent;
}
if(libssh2_channel_eof(channel)) {
fprintf(stderr, "The remote client at %s:%d disconnected!\n",