===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/less/ch.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -c -r1.18 -r1.19
*** src/usr.bin/less/ch.c	2016/03/16 15:36:26	1.18
--- src/usr.bin/less/ch.c	2016/09/17 15:06:41	1.19
***************
*** 82,88 ****
   * Macros to manipulate the list of buffers in thisfile->buflist.
   */
  #define	FOR_BUFS(bn) \
! 	for ((bn) = ch_bufhead;  (bn) != END_OF_CHAIN;  (bn) = (bn)->next)
  
  #define	BUF_RM(bn) \
  	(bn)->next->prev = (bn)->prev; \
--- 82,88 ----
   * Macros to manipulate the list of buffers in thisfile->buflist.
   */
  #define	FOR_BUFS(bn) \
! 	for ((bn) = ch_bufhead; (bn) != END_OF_CHAIN; (bn) = (bn)->next)
  
  #define	BUF_RM(bn) \
  	(bn)->next->prev = (bn)->prev; \
***************
*** 104,110 ****
   * Macros to manipulate the list of buffers in thisfile->hashtbl[n].
   */
  #define	FOR_BUFS_IN_CHAIN(h, bn) \
! 	for ((bn) = thisfile->hashtbl[h].hnext;  \
  	    (bn) != END_OF_HCHAIN(h); (bn) = (bn)->hnext)
  
  #define	BUF_HASH_RM(bn) \
--- 104,110 ----
   * Macros to manipulate the list of buffers in thisfile->hashtbl[n].
   */
  #define	FOR_BUFS_IN_CHAIN(h, bn) \
! 	for ((bn) = thisfile->hashtbl[h].hnext; \
  	    (bn) != END_OF_HCHAIN(h); (bn) = (bn)->hnext)
  
  #define	BUF_HASH_RM(bn) \
***************
*** 384,390 ****
  	BLOCKNUM nblocks;
  
  	nblocks = (ch_fpos + LBUFSIZE - 1) / LBUFSIZE;
! 	for (block = 0;  block < nblocks;  block++) {
  		int wrote = FALSE;
  		FOR_BUFS(bn) {
  			bp = bufnode_buf(bn);
--- 384,390 ----
  	BLOCKNUM nblocks;
  
  	nblocks = (ch_fpos + LBUFSIZE - 1) / LBUFSIZE;
! 	for (block = 0; block < nblocks; block++) {
  		int wrote = FALSE;
  		FOR_BUFS(bn) {
  			bp = bufnode_buf(bn);