From: Jim Meyering Date: Sat, 22 Jan 2011 11:55:58 +0000 (+0100) Subject: copy: tweak variable name; improve a comment X-Git-Tag: v8.10~29 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce3c73dddddf04a5f1e03f3830198ecc55e56c75;p=thirdparty%2Fcoreutils.git copy: tweak variable name; improve a comment * src/copy.c (copy_reg): Rename a variable to make more sense from caller's perspective: s/require_normal_copy/normal_copy_required/. This is an output-only variable, and the original name could make it look like an input (or i&o) variable. --- diff --git a/src/copy.c b/src/copy.c index be7fdba7b7..fae8dbe0e9 100644 --- a/src/copy.c +++ b/src/copy.c @@ -868,17 +868,17 @@ copy_reg (char const *src_name, char const *dst_name, #endif } - bool require_normal_copy; - /* Perform efficient extent copy for sparse file, fall back to the + bool normal_copy_required; + /* Perform an efficient extent-based copy, falling back to the standard copy only if the initial extent scan fails. If the - '--sparse=never' option was specified, we writing all data but - use extent copy if available to efficiently read. */ + '--sparse=never' option is specified, write all data but use + any extents to read more efficiently. */ if (extent_copy (source_desc, dest_desc, buf_size, src_open_sb.st_size, make_holes, - src_name, dst_name, &require_normal_copy)) + src_name, dst_name, &normal_copy_required)) goto preserve_metadata; - if (! require_normal_copy) + if (! normal_copy_required) { return_val = false; goto close_src_and_dst_desc;