diff options
| author | Jim Meyering <meyering@redhat.com> | 2012-01-01 01:46:34 +0100 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2012-05-02 10:31:47 +0200 |
| commit | b8a6996e258a2c30de40fb20cab0d17a38c3eff2 (patch) | |
| tree | 4c84dc578458441a112a4bc3c874cf27eccb231d /src/extent-scan.c | |
| parent | a18ba2f10a739e1f0ef31cf0ebd60c8cf95d74f0 (diff) | |
| download | coreutils-b8a6996e258a2c30de40fb20cab0d17a38c3eff2.tar.xz | |
maint: with split lines, don't leave an operator at end of line
* src/copy.c (copy_reg): Split an expression before a binary operator,
not after it.
* src/cut.c (set_fields): Likewise.
* src/id.c (main): Likewise.
* src/install.c (setdefaultfilecon): Likewise.
* src/join.c (ignore_case): Likewise.
* src/pr.c (cols_ready_to_print, init_parameters, print_page): Likewise.
* src/stty.c (set_window_size): Likewise.
* src/wc.c (SUPPORT_OLD_MBRTOWC): Likewise.
* src/who.c (scan_entries): Likewise.
* src/test.c (binary_operator): Join a split line.
* src/extent-scan.c (extent_scan_read): Move an ">" from end of line
to beginning of the following.
Likewise for two other expressions.
Diffstat (limited to 'src/extent-scan.c')
| -rw-r--r-- | src/extent-scan.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/extent-scan.c b/src/extent-scan.c index e269f54aa..0c25c5705 100644 --- a/src/extent-scan.c +++ b/src/extent-scan.c @@ -133,11 +133,11 @@ extent_scan_read (struct extent_scan *scan) unsigned int i = 0; for (i = 0; i < fiemap->fm_mapped_extents; i++) { - assert (fm_extents[i].fe_logical <= - OFF_T_MAX - fm_extents[i].fe_length); + assert (fm_extents[i].fe_logical + <= OFF_T_MAX - fm_extents[i].fe_length); - if (si && last_ei->ext_flags == - (fm_extents[i].fe_flags & ~FIEMAP_EXTENT_LAST) + if (si && last_ei->ext_flags + == (fm_extents[i].fe_flags & ~FIEMAP_EXTENT_LAST) && (last_ei->ext_logical + last_ei->ext_length == fm_extents[i].fe_logical)) { @@ -147,8 +147,8 @@ extent_scan_read (struct extent_scan *scan) last_ei->ext_flags = fm_extents[i].fe_flags; } else if ((si == 0 && scan->scan_start > fm_extents[i].fe_logical) - || (si && last_ei->ext_logical + last_ei->ext_length > - fm_extents[i].fe_logical)) + || (si && (last_ei->ext_logical + last_ei->ext_length + > fm_extents[i].fe_logical))) { /* BTRFS before 2.6.38 could return overlapping extents for sparse files. We adjust the returned extents |