Tweaking the license text a bit more.

[rsync/rsync.git] / io.h

diff --git a/io.h b/io.h
index dc43683..6ce4e10 100644 (file)
--- a/io.h
+++ b/io.h
@@ -2,8 +2,9 @@
  * Copyright (C) 2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
  * 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
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.

  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of


@@ -11,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
  * 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;
  */
 
 extern int protocol_version;


@@ -25,6 +25,14 @@ read_varint30(int f)
        return read_varint(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_varint30(int f, int32 x)
 {
 static inline void
 write_varint30(int f, int32 x)
 {


@@ -33,3 +41,12 @@ write_varint30(int f, int32 x)
        else
                write_varint(f, x);
 }
        else
                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);
+}