Moved the new static internal functions from rsync.h to io.h.

This commit is contained in:
Wayne Davison
2007-03-11 05:43:55 +00:00
parent 1c3344a105
commit 6d4e718f5f
3 changed files with 37 additions and 18 deletions

View File

@@ -22,6 +22,7 @@
#include "rsync.h"
#include "rounding.h"
#include "io.h"
extern int verbose;
extern int list_only;

35
io.h Normal file
View File

@@ -0,0 +1,35 @@
/*
* 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.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* 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.,
* 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
extern int protocol_version;
static inline int32
read_abbrevint30(int f)
{
if (protocol_version < 30)
return read_int(f);
return read_abbrevint(f);
}
static inline void
write_abbrevint30(int f, int32 x)
{
if (protocol_version < 30)
write_int(f, x);
else
write_abbrevint(f, x);
}

19
rsync.h
View File

@@ -1005,7 +1005,7 @@ size_t strlcat(char *d, const char *s, size_t bufsize);
#define MY_GID() getgid()
#endif
extern int verbose, protocol_version;
extern int verbose;
#ifndef HAVE_INET_NTOP
const char *inet_ntop(int af, const void *src, char *dst, size_t size);
@@ -1019,23 +1019,6 @@ int inet_pton(int af, const char *src, void *dst);
const char *get_panic_action(void);
#endif
static inline int32
read_abbrevint30(int f)
{
if (protocol_version < 30)
return read_int(f);
return read_abbrevint(f);
}
static inline void
write_abbrevint30(int f, int32 x)
{
if (protocol_version < 30)
write_int(f, x);
else
write_abbrevint(f, x);
}
static inline int
isDigit(const char *ptr)
{