diff --git a/alpine/packages/transfused/transfused.c b/alpine/packages/transfused/transfused.c index 7853e441d..f4baf3513 100644 --- a/alpine/packages/transfused/transfused.c +++ b/alpine/packages/transfused/transfused.c @@ -201,7 +201,7 @@ void read_exactly(char *descr, int fd, void *p, size_t nbyte) } } -int read_message(char *descr, parameters *params, int fd, +int read_message(char *descr, parameters_t *params, int fd, char *buf, size_t max_read) { size_t nbyte = sizeof(uint32_t); @@ -233,7 +233,8 @@ void copy_into_fuse(copy_thread_state *copy_state) char *descr = copy_state->connection->mount_point; int read_count, write_count; void *buf; - parameters *params = copy_state->connection->params; + connection_t *conn = copy_state->connection; + parameters_t *params = conn->params; buf = must_malloc(descr, IN_BUFSZ); @@ -263,7 +264,7 @@ void copy_notify_fuse(copy_thread_state *copy_state) int read_count, write_count; uint32_t zero = 0, err; void *buf; - parameters *params = copy_state->connection->params; + parameters_t *params = copy_state->connection->params; buf = must_malloc(descr, IN_BUFSZ); @@ -323,7 +324,8 @@ void copy_outof_fuse(copy_thread_state *copy_state) char *descr = copy_state->connection->mount_point; int read_count; void *buf; - parameters *params = copy_state->connection->params; + connection_t *conn = copy_state->connection; + parameters_t *params = conn->params; buf = must_malloc(descr, OUT_BUFSZ); @@ -387,7 +389,7 @@ void *copy_clean_outof_fuse_thread(void *copy_state) return copy_clean_outof_fuse((copy_thread_state *) copy_state); } -int recv_fd(parameters *params, int sock) +int recv_fd(parameters_t *params, int sock) { int ret; int fd = -1; @@ -625,7 +627,7 @@ void mkdir_p(connection_t *conn, char *path) } } -int is_next_child_ok(parameters *params, char *path, DIR *dir) +int is_next_child_ok(parameters_t *params, char *path, DIR *dir) { struct dirent *child; @@ -641,7 +643,7 @@ int is_next_child_ok(parameters *params, char *path, DIR *dir) return 1; } -int is_path_mountable(parameters *params, int allow_empty, char *path) +int is_path_mountable(parameters_t *params, int allow_empty, char *path) { DIR *dir; @@ -737,9 +739,9 @@ void *mount_connection(connection_t *conn) return NULL; } -void *mount_thread(void *connection) +void *mount_thread(void *conn) { - return mount_connection((connection_t *) connection); + return mount_connection((connection_t *) conn); } void write_pid(connection_t *connection) @@ -758,7 +760,7 @@ void write_pid(connection_t *connection) free(pid_s); } -void pong(parameters *params) +void pong(parameters_t *params) { char pong_msg[6] = {'\6', '\0', '\0', '\0', PONG_REPLY, '\0'}; @@ -862,7 +864,7 @@ void *event_thread(void *connection_ptr) return NULL; } -void write_pidfile(parameters *params) +void write_pidfile(parameters_t *params) { int fd; pid_t pid = getpid(); @@ -894,7 +896,7 @@ void write_pidfile(parameters *params) } /* TODO: the message parsing here is rickety, do it properly */ -void *determine_mount_suitability(parameters *params, int allow_empty, +void *determine_mount_suitability(parameters_t *params, int allow_empty, char *req, int len) { void *buf = (void *)req; @@ -928,7 +930,7 @@ void *determine_mount_suitability(parameters *params, int allow_empty, void *init_thread(void *params_ptr) { - parameters *params = params_ptr; + parameters_t *params = params_ptr; int read_count, len; char init_msg[6] = {'\6', '\0', '\0', '\0', '\0', '\0'}; void *buf, *response; @@ -998,7 +1000,7 @@ void setup_debug(void) die(1, NULL, "Couldn't set siginterrupt for SIGHUP", ""); } -void parse_parameters(int argc, char *argv[], parameters *params) +void parse_parameters(int argc, char *argv[], parameters_t *params) { int c; int errflg = 0; @@ -1085,7 +1087,7 @@ void parse_parameters(int argc, char *argv[], parameters *params) } } -void serve(parameters *params) +void serve(parameters_t *params) { char subproto_selector; pthread_t child; @@ -1140,7 +1142,7 @@ void serve(parameters *params) int main(int argc, char *argv[]) { - parameters params; + parameters_t params; struct rlimit core_limit; core_limit.rlim_cur = RLIM_INFINITY; diff --git a/alpine/packages/transfused/transfused.h b/alpine/packages/transfused/transfused.h index ba979bf68..268ffc075 100644 --- a/alpine/packages/transfused/transfused.h +++ b/alpine/packages/transfused/transfused.h @@ -42,10 +42,10 @@ typedef struct { int ctl_sock; int data_sock; pthread_mutex_t ctl_lock; -} parameters; +} parameters_t; typedef struct { - parameters *params; + parameters_t *params; char *type_descr; char *mount_point; struct sockaddr sa_client; diff --git a/alpine/packages/transfused/transfused_log.c b/alpine/packages/transfused/transfused_log.c index 287cfbaf9..3c464ae06 100644 --- a/alpine/packages/transfused/transfused_log.c +++ b/alpine/packages/transfused/transfused_log.c @@ -80,7 +80,7 @@ void log_sock_locked(int fd, uint16_t msg_type, const char *fmt, ...) va_end(args); } -void die(int exit_code, parameters *params, const char *parg, +void die(int exit_code, parameters_t *params, const char *parg, const char *fmt, ...) { va_list argp, targs; @@ -121,7 +121,7 @@ void die(int exit_code, parameters *params, const char *parg, unlock("die ctl_lock", ¶ms->ctl_lock); } -void vlog_locked(parameters *params, uint16_t msg_type, +void vlog_locked(parameters_t *params, uint16_t msg_type, const char *fmt, va_list args) { int rc; @@ -149,7 +149,7 @@ void vlog_locked(parameters *params, uint16_t msg_type, } } -void vlog_time_locked(parameters *params, uint16_t msg_type, +void vlog_time_locked(parameters_t *params, uint16_t msg_type, const char *fmt, va_list args) { int fd = params->logfile_fd; @@ -159,7 +159,7 @@ void vlog_time_locked(parameters *params, uint16_t msg_type, vlog_locked(params, msg_type, fmt, args); } -void log_time_locked(parameters *params, uint16_t msg_type, +void log_time_locked(parameters_t *params, uint16_t msg_type, const char *fmt, ...) { va_list args; @@ -169,7 +169,7 @@ void log_time_locked(parameters *params, uint16_t msg_type, va_end(args); } -void log_time(parameters *params, const char *fmt, ...) +void log_time(parameters_t *params, const char *fmt, ...) { va_list args; @@ -180,7 +180,7 @@ void log_time(parameters *params, const char *fmt, ...) va_end(args); } -void log_notice_time(parameters *params, const char *fmt, ...) +void log_notice_time(parameters_t *params, const char *fmt, ...) { va_list args; @@ -193,7 +193,7 @@ void log_notice_time(parameters *params, const char *fmt, ...) } typedef struct { - parameters *params; + parameters_t *params; char *msg; } log_thread_state; @@ -234,7 +234,7 @@ void thread_log_time(connection_t *conn, const char *fmt, ...) conn->type_descr, conn->mount_point); } -void log_continue_locked(parameters *params, const char *fmt, ...) +void log_continue_locked(parameters_t *params, const char *fmt, ...) { va_list args; @@ -243,7 +243,7 @@ void log_continue_locked(parameters *params, const char *fmt, ...) va_end(args); } -void log_continue(parameters *params, const char *fmt, ...) +void log_continue(parameters_t *params, const char *fmt, ...) { va_list args; diff --git a/alpine/packages/transfused/transfused_log.h b/alpine/packages/transfused/transfused_log.h index e2176a1e4..f500d2434 100644 --- a/alpine/packages/transfused/transfused_log.h +++ b/alpine/packages/transfused/transfused_log.h @@ -6,21 +6,21 @@ #include "transfused.h" -void die(int exit_code, parameters *params, const char *perror_arg, +void die(int exit_code, parameters_t *params, const char *perror_arg, const char *fmt, ...); -void vlog_locked(parameters *params, uint16_t msg_type, +void vlog_locked(parameters_t *params, uint16_t msg_type, const char *fmt, va_list args); -void vlog_time_locked(parameters *params, uint16_t msg_type, +void vlog_time_locked(parameters_t *params, uint16_t msg_type, const char *fmt, va_list args); -void log_time_locked(parameters *params, uint16_t msg_type, +void log_time_locked(parameters_t *params, uint16_t msg_type, const char *fmt, ...); -void log_time(parameters *params, const char *fmt, ...); -void log_notice_time(parameters *params, const char *fmt, ...); +void log_time(parameters_t *params, const char *fmt, ...); +void log_notice_time(parameters_t *params, const char *fmt, ...); void thread_log_time(connection_t *conn, const char *fmt, ...); -void log_continue_locked(parameters *params, const char *fmt, ...); -void log_continue(parameters *params, const char *fmt, ...); +void log_continue_locked(parameters_t *params, const char *fmt, ...); +void log_continue(parameters_t *params, const char *fmt, ...); #endif /* _TRANSFUSED_LOG_H_ */