=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rsync/extern.h,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- src/usr.bin/rsync/extern.h 2019/05/08 20:00:25 1.29 +++ src/usr.bin/rsync/extern.h 2019/05/08 21:30:11 1.30 @@ -1,4 +1,4 @@ -/* $Id: extern.h,v 1.29 2019/05/08 20:00:25 benno Exp $ */ +/* $Id: extern.h,v 1.30 2019/05/08 21:30:11 benno Exp $ */ /* * Copyright (c) 2019 Kristaps Dzonsons * @@ -275,7 +275,7 @@ int io_read_buf(struct sess *, int, void *, size_t); int io_read_byte(struct sess *, int, uint8_t *); -int io_read_check(struct sess *, int); +int io_read_check(int); int io_read_flush(struct sess *, int); int io_read_int(struct sess *, int, int32_t *); int io_read_uint(struct sess *, int, uint32_t *); @@ -297,17 +297,13 @@ void io_lowbuffer_buf(struct sess *, void *, size_t *, size_t, const void *, size_t); -void io_buffer_int(struct sess *, void *, - size_t *, size_t, int32_t); -void io_buffer_buf(struct sess *, void *, - size_t *, size_t, const void *, size_t); +void io_buffer_int(void *, size_t *, size_t, int32_t); +void io_buffer_buf(void *, size_t *, size_t, const void *, size_t); -void io_unbuffer_int(struct sess *, const void *, +void io_unbuffer_int(const void *, size_t *, size_t, int32_t *); -int io_unbuffer_size(struct sess *, const void *, - size_t *, size_t, size_t *); -void io_unbuffer_buf(struct sess *, const void *, - size_t *, size_t, void *, size_t); +int io_unbuffer_size(const void *, size_t *, size_t, size_t *); +void io_unbuffer_buf(const void *, size_t *, size_t, void *, size_t); int rsync_receiver(struct sess *, int, int, const char *); int rsync_sender(struct sess *, int, int, size_t, char **); @@ -328,13 +324,12 @@ struct download *download_alloc(struct sess *, int, const struct flist *, size_t, int); void download_free(struct download *); -struct upload *upload_alloc(struct sess *, const char *, int, int, size_t, +struct upload *upload_alloc(const char *, int, int, size_t, const struct flist *, size_t, mode_t); void upload_free(struct upload *); struct blkset *blk_recv(struct sess *, int, const char *); -void blk_recv_ack(struct sess *, - char [20], const struct blkset *, int32_t); +void blk_recv_ack(char [20], const struct blkset *, int32_t); void blk_match(struct sess *, const struct blkset *, const char *, struct blkstat *); int blk_send(struct sess *, int, size_t, @@ -347,23 +342,22 @@ void hash_file(const void *, size_t, unsigned char *, const struct sess *); -int mkpath(struct sess *, char *); +int mkpath(char *); int mkstempat(int, char *); char *mkstemplinkat(char*, int, char *); char *mkstempfifoat(int, char *); char *mkstempnodat(int, char *, mode_t, dev_t); char *mkstempsock(const char *, char *); -int mktemplate(struct sess *, char **, const char *, int); +int mktemplate(char **, const char *, int); -char *symlink_read(struct sess *, const char *); -char *symlinkat_read(struct sess *, int, const char *); +char *symlink_read(const char *); +char *symlinkat_read(int, const char *); int sess_stats_send(struct sess *, int); int sess_stats_recv(struct sess *, int); -int idents_add(struct sess *, int, struct ident **, size_t *, - int32_t); +int idents_add(int, struct ident **, size_t *, int32_t); void idents_assign_gid(struct sess *, struct flist *, size_t, const struct ident *, size_t); void idents_assign_uid(struct sess *,