===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rsync/blocks.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -c -r1.13 -r1.14
*** src/usr.bin/rsync/blocks.c	2019/02/18 22:47:34	1.13
--- src/usr.bin/rsync/blocks.c	2019/03/23 16:04:28	1.14
***************
*** 1,4 ****
! /*	$Id: blocks.c,v 1.13 2019/02/18 22:47:34 benno Exp $ */
  /*
   * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
   *
--- 1,4 ----
! /*	$Id: blocks.c,v 1.14 2019/03/23 16:04:28 deraadt Exp $ */
  /*
   * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
   *
***************
*** 69,79 ****
  		have_md = 1;
  		if (memcmp(md, blks->blks[hint].chksum_long, blks->csum) == 0) {
  			LOG4(sess, "%s: found matching hinted match: "
! 				"position %jd, block %zu "
! 				"(position %jd, size %zu)", path,
! 				(intmax_t)offs, blks->blks[hint].idx,
! 				(intmax_t)blks->blks[hint].offs,
! 				blks->blks[hint].len);
  			return &blks->blks[hint];
  		}
  	}
--- 69,79 ----
  		have_md = 1;
  		if (memcmp(md, blks->blks[hint].chksum_long, blks->csum) == 0) {
  			LOG4(sess, "%s: found matching hinted match: "
! 			    "position %jd, block %zu (position %jd, size %zu)",
! 			    path,
! 			    (intmax_t)offs, blks->blks[hint].idx,
! 			    (intmax_t)blks->blks[hint].offs,
! 			    blks->blks[hint].len);
  			return &blks->blks[hint];
  		}
  	}
***************
*** 90,100 ****
  			continue;
  
  		LOG4(sess, "%s: found matching fast match: "
! 			"position %jd, block %zu "
! 			"(position %jd, size %zu)", path,
! 			(intmax_t)offs, blks->blks[i].idx,
! 			(intmax_t)blks->blks[i].offs,
! 			blks->blks[i].len);
  
  		/* Compute slow hash on demand. */
  
--- 90,100 ----
  			continue;
  
  		LOG4(sess, "%s: found matching fast match: "
! 		    "position %jd, block %zu (position %jd, size %zu)",
! 		    path,
! 		    (intmax_t)offs, blks->blks[i].idx,
! 		    (intmax_t)blks->blks[i].offs,
! 		    blks->blks[i].len);
  
  		/* Compute slow hash on demand. */
  
***************
*** 155,163 ****
  			sz = st->offs - last;
  			st->dirty += sz;
  			st->total += sz;
! 			LOG4(sess, "%s: flushing %jd B before %zu B "
! 				"block %zu", path, (intmax_t)sz,
! 				blk->len, blk->idx);
  			tok = -(blk->idx + 1);
  
  			/*
--- 155,164 ----
  			sz = st->offs - last;
  			st->dirty += sz;
  			st->total += sz;
! 			LOG4(sess,
! 			    "%s: flushing %jd B before %zu B block %zu",
! 			    path, (intmax_t)sz,
! 			    blk->len, blk->idx);
  			tok = -(blk->idx + 1);
  
  			/*
***************
*** 180,186 ****
  
  		sz = st->mapsz - last;
  		LOG4(sess, "%s: flushing remaining %jd B",
! 			path, (intmax_t)sz);
  
  		st->total += sz;
  		st->dirty += sz;
--- 181,187 ----
  
  		sz = st->mapsz - last;
  		LOG4(sess, "%s: flushing remaining %jd B",
! 		    path, (intmax_t)sz);
  
  		st->total += sz;
  		st->dirty += sz;
***************
*** 196,202 ****
  		st->dirty = st->total = st->mapsz;
  
  		LOG4(sess, "%s: flushing whole file %zu B",
! 			path, st->mapsz);
  	}
  }
  
--- 197,203 ----
  		st->dirty = st->total = st->mapsz;
  
  		LOG4(sess, "%s: flushing whole file %zu B",
! 		    path, st->mapsz);
  	}
  }
  
***************
*** 269,276 ****
  	}
  
  	LOG3(sess, "%s: read block prologue: %zu blocks of "
! 		"%zu B, %zu B remainder, %zu B checksum", path,
! 		s->blksz, s->len, s->rem, s->csum);
  
  	if (s->blksz) {
  		s->blks = calloc(s->blksz, sizeof(struct blk));
--- 270,277 ----
  	}
  
  	LOG3(sess, "%s: read block prologue: %zu blocks of "
! 	    "%zu B, %zu B remainder, %zu B checksum", path,
! 	    s->blksz, s->len, s->rem, s->csum);
  
  	if (s->blksz) {
  		s->blks = calloc(s->blksz, sizeof(struct blk));
***************
*** 311,323 ****
  			s->rem : s->len;
  		offs += b->len;
  
! 		LOG4(sess, "%s: read block %zu, "
! 			"length %zu B", path, b->idx, b->len);
  	}
  
  	s->size = offs;
! 	LOG3(sess, "%s: read blocks: %zu blocks, %jd B total "
! 		"blocked data", path, s->blksz, (intmax_t)s->size);
  	return s;
  out:
  	free(s->blks);
--- 312,324 ----
  			s->rem : s->len;
  		offs += b->len;
  
! 		LOG4(sess, "%s: read block %zu, length %zu B",
! 		    path, b->idx, b->len);
  	}
  
  	s->size = offs;
! 	LOG3(sess, "%s: read blocks: %zu blocks, %jd B total blocked data",
! 	    path, s->blksz, (intmax_t)s->size);
  	return s;
  out:
  	free(s->blks);
***************
*** 415,422 ****
  	}
  
  	LOG3(sess, "%s: sent block prologue: %zu blocks of %zu B, "
! 		"%zu B remainder, %zu B checksum", path,
! 		p->blksz, p->len, p->rem, p->csum);
  	rc = 1;
  out:
  	free(buf);
--- 416,423 ----
  	}
  
  	LOG3(sess, "%s: sent block prologue: %zu blocks of %zu B, "
! 	    "%zu B remainder, %zu B checksum",
! 	    path, p->blksz, p->len, p->rem, p->csum);
  	rc = 1;
  out:
  	free(buf);