From: Jim Meyering <meyering@redhat.com>
Date: Mon, 11 Oct 2010 09:19:02 +0000 (+0200)
Subject: rename extent_scan member
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db7bd09c70c486fb343c39ab48667da016bfb920;p=thirdparty%2Fcoreutils.git

rename extent_scan member

* extent-scan.h [struct extent_scan]: Rename member:
s/hit_last_extent/hit_final_extent/.  "final" is clearer,
since "last" can be interpreted as "preceding".
---

diff --git a/src/copy.c b/src/copy.c
index 902c6bbea6..b309a86438 100644
--- a/src/copy.c
+++ b/src/copy.c
@@ -211,7 +211,7 @@ extent_copy (int src_fd, int dest_fd, size_t buf_size,
       bool ok = get_extents_info (&scan);
       if (! ok)
         {
-          if (scan.hit_last_extent)
+          if (scan.hit_final_extent)
             break;
 
           if (scan.initial_scan_failed)
@@ -305,7 +305,7 @@ extent_copy (int src_fd, int dest_fd, size_t buf_size,
 
       /* Release the space allocated to scan->ext_info.  */
       free_extents_info (&scan);
-    } while (! scan.hit_last_extent);
+    } while (! scan.hit_final_extent);
 
   /* Do nothing now.  */
   close_extent_scan (&scan);
diff --git a/src/extent-scan.c b/src/extent-scan.c
index f371b8718d..b0345f5af7 100644
--- a/src/extent-scan.c
+++ b/src/extent-scan.c
@@ -40,7 +40,7 @@ open_extent_scan (int src_fd, struct extent_scan *scan)
   scan->ei_count = 0;
   scan->scan_start = 0;
   scan->initial_scan_failed = false;
-  scan->hit_last_extent = false;
+  scan->hit_final_extent = false;
 }
 
 #ifdef __linux__
@@ -81,7 +81,7 @@ get_extents_info (struct extent_scan *scan)
   /* If 0 extents are returned, then more get_extent_table() are not needed.  */
   if (fiemap->fm_mapped_extents == 0)
     {
-      scan->hit_last_extent = true;
+      scan->hit_final_extent = true;
       return false;
     }
 
@@ -100,7 +100,7 @@ get_extents_info (struct extent_scan *scan)
   i--;
   if (scan->ext_info[i].ext_flags & FIEMAP_EXTENT_LAST)
     {
-      scan->hit_last_extent = true;
+      scan->hit_final_extent = true;
       return true;
     }
 
diff --git a/src/extent-scan.h b/src/extent-scan.h
index 07c2e5bc57..0c9c199e3c 100644
--- a/src/extent-scan.h
+++ b/src/extent-scan.h
@@ -50,7 +50,7 @@ struct extent_scan
   bool initial_scan_failed;
 
   /* If ture, the total extent scan per file has been finished.  */
-  bool hit_last_extent;
+  bool hit_final_extent;
 
   /* Extent information.  */
   struct extent_info *ext_info;