===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/telnet/ring.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -c -r1.9 -r1.10
*** src/usr.bin/telnet/ring.c	2014/07/20 09:59:42	1.9
--- src/usr.bin/telnet/ring.c	2014/07/20 10:32:23	1.10
***************
*** 1,4 ****
! /*	$OpenBSD: ring.c,v 1.9 2014/07/20 09:59:42 guenther Exp $	*/
  /*	$NetBSD: ring.c,v 1.7 1996/02/28 21:04:07 thorpej Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: ring.c,v 1.10 2014/07/20 10:32:23 jsg Exp $	*/
  /*	$NetBSD: ring.c,v 1.7 1996/02/28 21:04:07 thorpej Exp $	*/
  
  /*
***************
*** 127,133 ****
  ring_clear_mark(ring)
      Ring *ring;
  {
!     ring->mark = 0;
  }
  
  /*
--- 127,133 ----
  ring_clear_mark(ring)
      Ring *ring;
  {
!     ring->mark = NULL;
  }
  
  /*
***************
*** 155,161 ****
  
      if (ring->mark &&
  		(ring_subtract(ring, ring->mark, ring->consume) < count)) {
! 	ring->mark = 0;
      }
      ring->consume = ring_increment(ring, ring->consume, count);
      ring->consumetime = ++ring_clock;
--- 155,161 ----
  
      if (ring->mark &&
  		(ring_subtract(ring, ring->mark, ring->consume) < count)) {
! 	ring->mark = NULL;
      }
      ring->consume = ring_increment(ring, ring->consume, count);
      ring->consumetime = ++ring_clock;
***************
*** 211,217 ****
  ring_full_count(ring)
      Ring *ring;
  {
!     if ((ring->mark == 0) || (ring->mark == ring->consume)) {
  	if (ring_full(ring)) {
  	    return ring->size;	/* nothing consumed, but full */
  	} else {
--- 211,217 ----
  ring_full_count(ring)
      Ring *ring;
  {
!     if ((ring->mark == NULL) || (ring->mark == ring->consume)) {
  	if (ring_full(ring)) {
  	    return ring->size;	/* nothing consumed, but full */
  	} else {
***************
*** 230,236 ****
  ring_full_consecutive(ring)
      Ring *ring;
  {
!     if ((ring->mark == 0) || (ring->mark == ring->consume)) {
  	if ((ring->supply < ring->consume) || ring_full(ring)) {
  	    return ring_subtract(ring, ring->top, ring->consume);
  	} else {
--- 230,236 ----
  ring_full_consecutive(ring)
      Ring *ring;
  {
!     if ((ring->mark == NULL) || (ring->mark == ring->consume)) {
  	if ((ring->supply < ring->consume) || ring_full(ring)) {
  	    return ring_subtract(ring, ring->top, ring->consume);
  	} else {