Tweaking the license text a bit more.

[rsync/rsync.git] / hlink.c

diff --git a/hlink.c b/hlink.c
index 25a7ed3..e9e76cd 100644 (file)
--- a/hlink.c
+++ b/hlink.c
@@ -7,8 +7,9 @@
  * Copyright (C) 2004-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 2 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
@@ -16,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ * with this program; if not, visit the http://fsf.org website.
  */
 
 #include "rsync.h"
@@ -225,7 +225,7 @@ static void match_gnums(int32 *ndx_list, int ndx_count)
        for (from = 0; from < ndx_count; from++) {
                for (file = cur_flist->sorted[ndx_list[from]], gnum = F_HL_GNUM(file), prev = -1;
                     from < ndx_count-1;
-                    file = file_next, gnum = gnum_next, from++)
+                    file = file_next, gnum = gnum_next, from++) /*SHARED ITERATOR*/
                {
                        file_next = cur_flist->sorted[ndx_list[from+1]];
                        gnum_next = F_HL_GNUM(file_next);
@@ -260,10 +260,10 @@ void match_hard_links(void)
        int i, ndx_count = 0;
        int32 *ndx_list;
 
-       if (!(ndx_list = new_array(int32, cur_flist->count)))
+       if (!(ndx_list = new_array(int32, cur_flist->used)))
                out_of_memory("match_hard_links");
 
-       for (i = 0; i < cur_flist->count; i++) {
+       for (i = 0; i < cur_flist->used; i++) {
                if (F_IS_HLINKED(cur_flist->sorted[i]))
                        ndx_list[ndx_count++] = i;
        }