aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-11-04 08:17:17 -05:00
Code

[ftp] cast

Browse Source
This commit is contained in:
Witold Filipczyk 2022-01-25 19:14:40 +01:00
parent 0a4373a04a
commit 0d7aadf67c
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/protocol/ftp/ftp.c
View File

@ -198,7 +198,7 @@ get_ftp_response(struct connection *conn, struct read_buffer *rb, int part,
int pos; int pos;
again: again:
eol = memchr(rb->data, ASCII_LF, rb->length); eol = (char *)memchr(rb->data, ASCII_LF, rb->length);
if (!eol) return 0; if (!eol) return 0;
pos = eol - rb->data; pos = eol - rb->data;
@ -297,7 +297,7 @@ send_cmd(struct connection *conn, struct string *cmd, void *callback,
struct connection_state state) struct connection_state state)
{ {
request_from_socket(conn->socket, cmd->source, cmd->length, state, request_from_socket(conn->socket, cmd->source, cmd->length, state,
SOCKET_RETRY_ONCLOSE, callback); SOCKET_RETRY_ONCLOSE, (socket_read_T)callback);
done_string(cmd); done_string(cmd);
} }
@ -340,7 +340,7 @@ prompt_username_pw(struct connection *conn)
static void static void
ftp_login(struct socket *socket) ftp_login(struct socket *socket)
{ {
struct connection *conn = socket->conn; struct connection *conn = (struct connection *)socket->conn;
struct string cmd; struct string cmd;
struct auth_entry* auth; struct auth_entry* auth;
@ -372,7 +372,7 @@ ftp_login(struct socket *socket)
static void static void
ftp_got_info(struct socket *socket, struct read_buffer *rb) ftp_got_info(struct socket *socket, struct read_buffer *rb)
{ {
struct connection *conn = socket->conn; struct connection *conn = (struct connection *)socket->conn;
int response = get_ftp_response(conn, rb, 0, NULL, NULL); int response = get_ftp_response(conn, rb, 0, NULL, NULL);
if (response == -1) { if (response == -1) {
@ -404,7 +404,7 @@ ftp_got_info(struct socket *socket, struct read_buffer *rb)
static void static void
ftp_got_user_info(struct socket *socket, struct read_buffer *rb) ftp_got_user_info(struct socket *socket, struct read_buffer *rb)
{ {
struct connection *conn = socket->conn; struct connection *conn = (struct connection *)socket->conn;
int response = get_ftp_response(conn, rb, 0, NULL, NULL); int response = get_ftp_response(conn, rb, 0, NULL, NULL);
if (response == -1) { if (response == -1) {
@ -490,7 +490,7 @@ ftp_pass(struct connection *conn)
static void static void
ftp_pass_info(struct socket *socket, struct read_buffer *rb) ftp_pass_info(struct socket *socket, struct read_buffer *rb)
{ {
struct connection *conn = socket->conn; struct connection *conn = (struct connection *)socket->conn;
int response = get_ftp_response(conn, rb, 0, NULL, NULL); int response = get_ftp_response(conn, rb, 0, NULL, NULL);
if (response == -1) { if (response == -1) {
@ -600,7 +600,7 @@ add_eprtcmd_to_string(struct string *string, struct sockaddr_in6 *addr)
static int static int
get_ftp_data_socket(struct connection *conn, struct string *command) get_ftp_data_socket(struct connection *conn, struct string *command)
{ {
struct ftp_connection_info *ftp = conn->info; struct ftp_connection_info *ftp = (struct ftp_connection_info *)conn->info;
ftp->use_pasv = get_opt_bool("protocol.ftp.use_pasv", NULL); ftp->use_pasv = get_opt_bool("protocol.ftp.use_pasv", NULL);
@ -830,7 +830,7 @@ ret:
static void static void
send_it_line_by_line(struct connection *conn, struct string *cmd) send_it_line_by_line(struct connection *conn, struct string *cmd)
{ {
struct ftp_connection_info *ftp = conn->info; struct ftp_connection_info *ftp = (struct ftp_connection_info *)conn->info;
char *nl = strchr(ftp->cmd_buffer, '\n'); char *nl = strchr(ftp->cmd_buffer, '\n');
if (!nl) { if (!nl) {
@ -966,8 +966,8 @@ ftp_data_connect(struct connection *conn, int pf, struct sockaddr_storage *sa,
static void static void
ftp_retr_file(struct socket *socket, struct read_buffer *rb) ftp_retr_file(struct socket *socket, struct read_buffer *rb)
{ {
struct connection *conn = socket->conn; struct connection *conn = (struct connection *)socket->conn;
struct ftp_connection_info *ftp = conn->info; struct ftp_connection_info *ftp = (struct ftp_connection_info *)conn->info;
int response; int response;
off_t size = -1; off_t size = -1;
@ -1107,8 +1107,8 @@ ftp_retr_file(struct socket *socket, struct read_buffer *rb)
static void static void
ftp_got_final_response(struct socket *socket, struct read_buffer *rb) ftp_got_final_response(struct socket *socket, struct read_buffer *rb)
{ {
struct connection *conn = socket->conn; struct connection *conn = (struct connection *)socket->conn;
struct ftp_connection_info *ftp = conn->info; struct ftp_connection_info *ftp = (struct ftp_connection_info *)conn->info;
int response = get_ftp_response(conn, rb, 0, NULL, NULL); int response = get_ftp_response(conn, rb, 0, NULL, NULL);
if (response == -1) { if (response == -1) {
@ -1314,7 +1314,7 @@ ftp_get_line(struct cache_entry *cached, char *buf, int bufl,
if (!bufl) return -1; if (!bufl) return -1;
newline = memchr(buf, ASCII_LF, bufl); newline = (char *)memchr(buf, ASCII_LF, bufl);
if (newline) { if (newline) {
*len = newline - buf; *len = newline - buf;
@ -1426,7 +1426,7 @@ ftp_process_dirlist(struct cache_entry *cached, off_t *pos,
static void static void
ftp_data_accept(struct connection *conn) ftp_data_accept(struct connection *conn)
{ {
struct ftp_connection_info *ftp = conn->info; struct ftp_connection_info *ftp = (struct ftp_connection_info *)conn->info;
int newsock; int newsock;
/* Because this function is called only as a read handler of /* Because this function is called only as a read handler of
@ -1466,7 +1466,7 @@ ftp_data_accept(struct connection *conn)
static void static void
got_something_from_data_connection(struct connection *conn) got_something_from_data_connection(struct connection *conn)
{ {
struct ftp_connection_info *ftp = conn->info; struct ftp_connection_info *ftp = (struct ftp_connection_info *)conn->info;
struct ftp_dir_html_format format; struct ftp_dir_html_format format;
ssize_t len; ssize_t len;

10
src/protocol/ftp/parse.c
View File

@ -81,7 +81,7 @@ parse_ftp_eplf_response(struct ftp_file_info *info, char *src, int len)
for (; src < end && pos; src = pos + 1) { for (; src < end && pos; src = pos + 1) {
/* Find the end of the current fact. */ /* Find the end of the current fact. */
pos = memchr(src, ',', end - src); pos = (char *)memchr(src, ',', end - src);
if (!pos) pos = end; if (!pos) pos = end;
switch (*src++) { switch (*src++) {
@ -343,7 +343,7 @@ parse_ftp_unix_response(struct ftp_file_info *info, char *src, int len)
break; break;
} }
pos = memchr(pos + 1, ' ', end - pos); pos = (char *)memchr(pos + 1, ' ', end - pos);
} }
if (!info->symlink.source) if (!info->symlink.source)
@ -440,7 +440,7 @@ parse_ftp_vms_response(struct ftp_file_info *info, char *src, int len)
* remove it and check the extension of the file; extension .DIR denotes * remove it and check the extension of the file; extension .DIR denotes
* directory. */ * directory. */
pos = memchr(src, ';', end - src); pos = (char *)memchr(src, ';', end - src);
if (!pos) return NULL; if (!pos) return NULL;
info->name.source = src; info->name.source = src;
@ -499,13 +499,13 @@ parse_ftp_vms_response(struct ftp_file_info *info, char *src, int len)
/* Sixth column: Permissions */ /* Sixth column: Permissions */
src = memchr(src, '(', end - src); src = (char *)memchr(src, '(', end - src);
if (!src || src >= end) if (!src || src >= end)
return info; return info;
src++; src++;
pos = memchr(src, ')', end - src); pos = (char *)memchr(src, ')', end - src);
if (!pos) return info; if (!pos) return info;
/* Permissons have the format "RWED,RWED,RE" */ /* Permissons have the format "RWED,RWED,RE" */