Tweaked set_allow_inc_recurse() a bit more.

[rsync/rsync.git] / rsync.c

diff --git a/rsync.c b/rsync.c
index d22e4df..573641a 100644 (file)
--- a/rsync.c
+++ b/rsync.c
@@ -71,7 +71,7 @@ static const char *default_charset(void)
 # endif
 }
 
-void setup_iconv()
+void setup_iconv(void)
 {
        const char *defset = default_charset();
 # ifdef ICONV_OPTION
@@ -337,11 +337,11 @@ mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int dflt_perms,
        return new_mode;
 }
 
-int set_file_attrs(const char *fname, struct file_struct *file, statx *sxp,
+int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
                   const char *fnamecmp, int flags)
 {
        int updated = 0;
-       statx sx2;
+       stat_x sx2;
        int change_uid, change_gid;
        mode_t new_mode = file->mode;
        int inherit;
@@ -401,9 +401,9 @@ int set_file_attrs(const char *fname, struct file_struct *file, statx *sxp,
        change_gid = gid_ndx && !(file->flags & FLAG_SKIP_GROUP)
                  && sxp->st.st_gid != (gid_t)F_GROUP(file);
 #if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK
-       if (S_ISLNK(sxp->st.st_mode))
+       if (S_ISLNK(sxp->st.st_mode)) {
                ;
-       else
+       } else
 #endif
        if (change_uid || change_gid) {
                if (verbose > 2) {