diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-08-22 12:07:11 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-08-22 12:07:38 -0700 |
| commit | 1505b379af16deab5b301b2f07f1d659ce2137cb (patch) | |
| tree | 1440f36a221c904d2db821325cc07ae2fe9ecbbb /src/copy.c | |
| parent | 00d0c41d857a1c74169e43d1fba761cdd5279dba (diff) | |
| download | coreutils-1505b379af16deab5b301b2f07f1d659ce2137cb.tar.xz | |
maint: avoid int64_t and similar types unless they're needed
C11 doesn't require them, even POSIX doesn't strictly require the
64-bit versions, and it makes the code a bit clearer if they're
used only when needed.
* src/copy.c (write_zeros, extent_copy):
* src/extent-scan.h (struct extent_info.ext_length):
Use off_t, not uint64_t, for a value derived from a file offset.
* src/extent-scan.h (struct extent_info.ext_flags)
Prefer plain unsigned int to uint32_t where either will do.
(struct extent_scan.ei_count):
Use size_t, not uint32_t, for a value bounded by SIZE_MAX.
* src/factor.c (MAGIC64, MAGIC63, MAGIC65):
Remove unnecessary casts to uint64_t.
Diffstat (limited to 'src/copy.c')
| -rw-r--r-- | src/copy.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/copy.c b/src/copy.c index 26d5bdd29..a9561c606 100644 --- a/src/copy.c +++ b/src/copy.c @@ -251,7 +251,7 @@ clone_file (int dest_fd, int src_fd) /* Write N_BYTES zero bytes to file descriptor FD. Return true if successful. Upon write failure, set errno and return false. */ static bool -write_zeros (int fd, uint64_t n_bytes) +write_zeros (int fd, off_t n_bytes) { static char *zeros; static size_t nz = IO_BUFSIZE; @@ -272,7 +272,7 @@ write_zeros (int fd, uint64_t n_bytes) while (n_bytes) { - uint64_t n = MIN (nz, n_bytes); + size_t n = MIN (nz, n_bytes); if ((full_write (fd, zeros, n)) != n) return false; n_bytes -= n; @@ -296,7 +296,7 @@ extent_copy (int src_fd, int dest_fd, char *buf, size_t buf_size, { struct extent_scan scan; off_t last_ext_start = 0; - uint64_t last_ext_len = 0; + off_t last_ext_len = 0; /* Keep track of the output position. We may need this at the end, for a final ftruncate. */ @@ -330,8 +330,8 @@ extent_copy (int src_fd, int dest_fd, char *buf, size_t buf_size, for (i = 0; i < scan.ei_count || empty_extent; i++) { off_t ext_start; - uint64_t ext_len; - uint64_t hole_size; + off_t ext_len; + off_t hole_size; if (i < scan.ei_count) { |