=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rsync/extern.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- src/usr.bin/rsync/extern.h 2019/02/18 21:55:27 1.20 +++ src/usr.bin/rsync/extern.h 2019/02/18 22:47:34 1.21 @@ -1,4 +1,4 @@ -/* $Id: extern.h,v 1.20 2019/02/18 21:55:27 benno Exp $ */ +/* $Id: extern.h,v 1.21 2019/02/18 22:47:34 benno Exp $ */ /* * Copyright (c) 2019 Kristaps Dzonsons * @@ -135,11 +135,12 @@ enum blkstatst { BLKSTAT_NONE = 0, - BLKSTAT_DATASZ, + BLKSTAT_NEXT, BLKSTAT_DATA, BLKSTAT_TOK, BLKSTAT_HASH, - BLKSTAT_DONE + BLKSTAT_DONE, + BLKSTAT_PHASE, }; /* @@ -325,8 +326,8 @@ void upload_free(struct upload *); struct blkset *blk_recv(struct sess *, int, const char *); -int blk_recv_ack(struct sess *, - int, const struct blkset *, int32_t); +void blk_recv_ack(struct sess *, + 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, @@ -346,7 +347,7 @@ char *mkstempfifoat(int, char *); char *mkstempnodat(int, char *, mode_t, dev_t); char *mkstempsock(const char *, char *); -int mktemplate(char **, const char *, int); +int mktemplate(struct sess *, char **, const char *, int); char *symlink_read(struct sess *, const char *); char *symlinkat_read(struct sess *, int, const char *);