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
Get rid of the last strcpy() call by using an static inline function.
[rsync/rsync.git]
/
rsync.h
diff --git
a/rsync.h
b/rsync.h
index
bc7a46a
..
a70c241
100644
(file)
--- a/
rsync.h
+++ b/
rsync.h
@@
-161,7
+161,7
@@
/* Log-message categories. Only FERROR and FINFO get sent over the socket,
* but FLOG and FSOCKERR can be sent over the receiver -> generator pipe.
* FLOG only goes to the log file, not the client; FCLIENT is the opposite. */
/* Log-message categories. Only FERROR and FINFO get sent over the socket,
* but FLOG and FSOCKERR can be sent over the receiver -> generator pipe.
* FLOG only goes to the log file, not the client; FCLIENT is the opposite. */
-enum logcode { FERROR=1, FINFO=2, FLOG=3, FCLIENT=4, FSOCKERR=5 };
+enum logcode { F
NONE=0, F
ERROR=1, FINFO=2, FLOG=3, FCLIENT=4, FSOCKERR=5 };
/* Messages types that are sent over the message channel. The logcode
* values must all be present here with identical numbers. */
/* Messages types that are sent over the message channel. The logcode
* values must all be present here with identical numbers. */
@@
-314,6
+314,12
@@
enum msgcode {
#include <sys/sysmacros.h>
#endif
#include <sys/sysmacros.h>
#endif
+#ifdef MAKEDEV_TAKES_3_ARGS
+#define MAKEDEV(devmajor,devminor) makedev(0,devmajor,devminor)
+#else
+#define MAKEDEV(devmajor,devminor) makedev(devmajor,devminor)
+#endif
+
#ifdef HAVE_COMPAT_H
#include <compat.h>
#endif
#ifdef HAVE_COMPAT_H
#include <compat.h>
#endif
@@
-383,10
+389,7
@@
enum msgcode {
* to ensure that any code that really requires a 64-bit integer has
* it (e.g. the checksum code uses two 32-bit integers for its 64-bit
* counter). */
* to ensure that any code that really requires a 64-bit integer has
* it (e.g. the checksum code uses two 32-bit integers for its 64-bit
* counter). */
-#if SIZEOF_OFF64_T == 8
-# define int64 off64_t
-# define SIZEOF_INT64 8
-#elif SIZEOF_LONG == 8
+#if SIZEOF_LONG == 8
# define int64 long
# define SIZEOF_INT64 8
#elif SIZEOF_INT == 8
# define int64 long
# define SIZEOF_INT64 8
#elif SIZEOF_INT == 8
@@
-395,6
+398,9
@@
enum msgcode {
#elif SIZEOF_LONG_LONG == 8
# define int64 long long
# define SIZEOF_INT64 8
#elif SIZEOF_LONG_LONG == 8
# define int64 long long
# define SIZEOF_INT64 8
+#elif SIZEOF_OFF64_T == 8
+# define int64 off64_t
+# define SIZEOF_INT64 8
#elif SIZEOF_OFF_T == 8
# define int64 off_t
# define SIZEOF_INT64 8
#elif SIZEOF_OFF_T == 8
# define int64 off_t
# define SIZEOF_INT64 8
@@
-492,8
+498,9
@@
struct idev {
#define HL_SKIP 1
struct hlink {
#define HL_SKIP 1
struct hlink {
- int next;
- int hlindex;
+ int32 next;
+ int32 hlindex;
+ unsigned short link_dest_used;
};
#define F_DEV link_u.idev->dev
};
#define F_DEV link_u.idev->dev
@@
-652,14
+659,12
@@
struct chmod_mode_struct;
#include "lib/permstring.h"
#include "lib/addrinfo.h"
#include "lib/permstring.h"
#include "lib/addrinfo.h"
-#if !defined __GNUC__ || defined __APPLE__
-/* Apparently the OS X port of gcc gags on __attribute__.
- *
- * <http://www.opensource.apple.com/bugs/X/gcc/2512150.html> */
+#ifndef __GNUC__
#define __attribute__(x)
#endif
#define UNUSED(x) x __attribute__((__unused__))
#define __attribute__(x)
#endif
#define UNUSED(x) x __attribute__((__unused__))
+#define NORETURN __attribute__((__noreturn__))
#include "proto.h"
#include "proto.h"
@@
-849,6
+854,9
@@
size_t strlcat(char *d, const char *s, size_t bufsize);
#ifndef WEXITSTATUS
#define WEXITSTATUS(stat) ((int)(((stat)>>8)&0xFF))
#endif
#ifndef WEXITSTATUS
#define WEXITSTATUS(stat) ((int)(((stat)>>8)&0xFF))
#endif
+#ifndef WIFEXITED
+#define WIFEXITED(stat) ((int)((stat)&0xFF) == 0)
+#endif
#define exit_cleanup(code) _exit_cleanup(code, __FILE__, __LINE__)
#define exit_cleanup(code) _exit_cleanup(code, __FILE__, __LINE__)