===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rsync/blocks.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -c -r1.18 -r1.19
*** src/usr.bin/rsync/blocks.c	2019/06/02 17:36:48	1.18
--- src/usr.bin/rsync/blocks.c	2019/06/02 17:43:34	1.19
***************
*** 1,4 ****
! /*	$Id: blocks.c,v 1.18 2019/06/02 17:36:48 florian Exp $ */
  /*
   * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
   *
--- 1,4 ----
! /*	$Id: blocks.c,v 1.19 2019/06/02 17:43:34 deraadt Exp $ */
  /*
   * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
   *
***************
*** 32,38 ****
  
  struct	blkhash {
  	const struct blk	*blk;
! 	TAILQ_ENTRY(blkhash) 	 entries;
  };
  
  TAILQ_HEAD(blkhashq, blkhash);
--- 32,38 ----
  
  struct	blkhash {
  	const struct blk	*blk;
! 	TAILQ_ENTRY(blkhash)	 entries;
  };
  
  TAILQ_HEAD(blkhashq, blkhash);
***************
*** 100,107 ****
  
  	/* Fill in the hashtable. */
  
! 	p->blks = reallocarray(p->blks, 
! 		bset->blksz, sizeof(struct blkhash));
  	if (p->blks == NULL) {
  		ERR("reallocarray");
  		return 0;
--- 100,106 ----
  
  	/* Fill in the hashtable. */
  
! 	p->blks = reallocarray(p->blks, bset->blksz, sizeof(struct blkhash));
  	if (p->blks == NULL) {
  		ERR("reallocarray");
  		return 0;
***************
*** 229,235 ****
  	if (osz < remain) {
  		st->s1 += map[osz];
  		st->s2 += st->s1;
! 	} 
  
  	return NULL;
  }
--- 228,234 ----
  	if (osz < remain) {
  		st->s1 += map[osz];
  		st->s2 += st->s1;
! 	}
  
  	return NULL;
  }
***************
*** 521,528 ****
  	io_buffer_int(buf, &pos, sz, p->rem);
  
  	for (i = 0; i < p->blksz; i++) {
! 		io_buffer_int(buf, &pos,
! 			sz, p->blks[i].chksum_short);
  		io_buffer_buf(buf, &pos, sz, p->blks[i].chksum_long, p->csum);
  	}
  
--- 520,526 ----
  	io_buffer_int(buf, &pos, sz, p->rem);
  
  	for (i = 0; i < p->blksz; i++) {
! 		io_buffer_int(buf, &pos, sz, p->blks[i].chksum_short);
  		io_buffer_buf(buf, &pos, sz, p->blks[i].chksum_long, p->csum);
  	}