X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/4fd842f98df4970f6e49a0365dbed60774e56c09..8e41b68e8f975c02a5d9281be780ba5d1a385107:/io.c

diff --git a/io.c b/io.c
index 7edc5628..0ab9f57b 100644
--- a/io.c
+++ b/io.c
@@ -7,8 +7,9 @@
  * Copyright (C) 2003-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -444,13 +445,13 @@ static void decrement_flist_in_progress(int ndx, int redo)
 			rprintf(FERROR,
 				"Invalid file index: %d (%d - %d) [%s]\n",
 				ndx, first_flist->ndx_start,
-				first_flist->prev->ndx_start + first_flist->prev->count - 1,
+				first_flist->prev->ndx_start + first_flist->prev->used - 1,
 				who_am_i());
 			exit_cleanup(RERR_PROTOCOL);
 		}
 		flist = flist->prev;
 	}
-	while (ndx >= flist->ndx_start + flist->count) {
+	while (ndx >= flist->ndx_start + flist->used) {
 		if (!(flist = flist->next))
 			goto invalid_ndx;
 	}
@@ -876,7 +877,7 @@ void maybe_send_keepalive(void)
 			if (protocol_version >= 30)
 				send_msg(MSG_NOOP, "", 0, 0);
 			else {
-				write_int(sock_f_out, cur_flist->count);
+				write_int(sock_f_out, cur_flist->used);
 				write_shortint(sock_f_out, ITEM_IS_NEW);
 			}
 		}