Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Got rid of unused pstring/P_GSTRING/P_SEP/P_SEPARATOR code.
[rsync/rsync.git]
/
fileio.c
diff --git
a/fileio.c
b/fileio.c
index
d97cdac
..
93cf573
100644
(file)
--- a/
fileio.c
+++ b/
fileio.c
@@
-3,7
+3,7
@@
*
* Copyright (C) 1998 Andrew Tridgell
* Copyright (C) 2002 Martin Pool
*
* Copyright (C) 1998 Andrew Tridgell
* Copyright (C) 2002 Martin Pool
- * Copyright (C) 2004-200
7
Wayne Davison
+ * Copyright (C) 2004-200
8
Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-159,13
+159,12
@@
struct map_struct *map_file(int fd, OFF_T len, int32 read_size,
{
struct map_struct *map;
{
struct map_struct *map;
- if (!(map = new(struct map_struct)))
+ if (!(map = new
0
(struct map_struct)))
out_of_memory("map_file");
if (blk_size && (read_size % blk_size))
read_size += blk_size - (read_size % blk_size);
out_of_memory("map_file");
if (blk_size && (read_size % blk_size))
read_size += blk_size - (read_size % blk_size);
- memset(map, 0, sizeof map[0]);
map->fd = fd;
map->file_size = len;
map->def_window_size = read_size;
map->fd = fd;
map->file_size = len;
map->def_window_size = read_size;
@@
-233,8
+232,8
@@
char *map_ptr(struct map_struct *map, OFF_T offset, int32 len)
if (map->p_fd_offset != read_start) {
OFF_T ret = do_lseek(map->fd, read_start, SEEK_SET);
if (ret != read_start) {
if (map->p_fd_offset != read_start) {
OFF_T ret = do_lseek(map->fd, read_start, SEEK_SET);
if (ret != read_start) {
- rsyserr(FERROR, errno, "lseek returned %
.0f, not %.0f
",
-
(double)ret, (double)read_start
);
+ rsyserr(FERROR, errno, "lseek returned %
s, not %s
",
+
big_num(ret, 0), big_num(read_start, 0)
);
exit_cleanup(RERR_FILEIO);
}
map->p_fd_offset = read_start;
exit_cleanup(RERR_FILEIO);
}
map->p_fd_offset = read_start;