X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/0f78b81511be65d8fe21af1e6ac674f9e80ac29d..aac5cab80b9d4fc0adff2b72aeba2406176930ae:/fileio.c diff --git a/fileio.c b/fileio.c index 138301cb..a1b68d1c 100644 --- a/fileio.c +++ b/fileio.c @@ -15,9 +15,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ #include "rsync.h" @@ -190,7 +190,7 @@ char *map_ptr(struct map_struct *map, OFF_T offset, int32 len) window_start = offset; window_size = map->def_window_size; if (window_start + window_size > map->file_size) - window_size = map->file_size - window_start; + window_size = (int32)(map->file_size - window_start); if (len > window_size) window_size = len; @@ -208,7 +208,7 @@ char *map_ptr(struct map_struct *map, OFF_T offset, int32 len) window_start < map->p_offset + map->p_len && window_start + window_size >= map->p_offset + map->p_len) { read_start = map->p_offset + map->p_len; - read_offset = read_start - window_start; + read_offset = (int32)(read_start - window_start); read_size = window_size - read_offset; memmove(map->p, map->p + (map->p_len - read_offset), read_offset); } else {