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
Fixed our supplied getnameinfo()'s ability to do a reverse lookup,
[rsync/rsync.git]
/
io.h
diff --git
a/io.h
b/io.h
index
360a947
..
ae99459
100644
(file)
--- a/
io.h
+++ b/
io.h
@@
-1,9
+1,10
@@
/*
/*
- * Copyright (C) 2007 Wayne Davison
+ * Copyright (C) 2007
-2008
Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
*
* 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,25
+12,41
@@
* 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;
static inline int32
*/
extern int protocol_version;
static inline int32
-read_
abbrev
int30(int f)
+read_
var
int30(int f)
{
if (protocol_version < 30)
return read_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
}
static inline void
-write_
abbrev
int30(int f, int32 x)
+write_
var
int30(int f, int32 x)
{
if (protocol_version < 30)
write_int(f, x);
else
{
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);
}
}