X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/6d4e718f5fecd4e02e5958f477922e9bec8a4559..4fd842f98df4970f6e49a0365dbed60774e56c09:/io.h diff --git a/io.h b/io.h index 360a9479..775cfdb9 100644 --- a/io.h +++ b/io.h @@ -2,7 +2,7 @@ * Copyright (C) 2007 Wayne Davison * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as + * it under the terms of the GNU General Public License version 3 as * published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, @@ -11,25 +11,41 @@ * 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., - * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. + * with this program; if not, visit the http://fsf.org website. */ extern int protocol_version; static inline int32 -read_abbrevint30(int f) +read_varint30(int f) { if (protocol_version < 30) return read_int(f); - return read_abbrevint(f); + return read_varint(f); +} + +static inline int64 +read_varlong30(int f, uchar min_bytes) +{ + if (protocol_version < 30) + return read_longint(f); + return read_varlong(f, min_bytes); } static inline void -write_abbrevint30(int f, int32 x) +write_varint30(int f, int32 x) { if (protocol_version < 30) write_int(f, x); else - write_abbrevint(f, x); + write_varint(f, x); +} + +static inline void +write_varlong30(int f, int64 x, uchar min_bytes) +{ + if (protocol_version < 30) + write_longint(f, x); + else + write_varlong(f, x, min_bytes); }