Create GID_NONE for use gid test readability.

diff --git a/generator.c b/generator.c
index d03ba2b..ba88970 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -54,14 +54,14 @@ static int skip_file(char *fname,
        }
        if (link_dest) {
                if (preserve_perms
-                && (st->st_mode & ~_S_IFMT) != (file->mode & ~_S_IFMT))
+                   && (st->st_mode & ~_S_IFMT) != (file->mode & ~_S_IFMT))
                        return 0;
 
                if (am_root && preserve_uid && st->st_uid != file->uid)
                        return 0;
 
-               if (preserve_gid && file->gid != (gid_t)-1
-                && st->st_gid != file->gid)
+               if (preserve_gid && file->gid != GID_NONE
+                   && st->st_gid != file->gid)
                        return 0;
        }
 

diff --git a/rsync.c b/rsync.c
index ad9293c..9bd7e42 100644 (file)
--- a/rsync.c
+++ b/rsync.c
@@ -152,7 +152,7 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
        }
 
        change_uid = am_root && preserve_uid && st->st_uid != file->uid;
-       change_gid = preserve_gid && file->gid != (gid_t)-1
+       change_gid = preserve_gid && file->gid != GID_NONE
                && st->st_gid != file->gid;
        if (change_uid || change_gid) {
                if (do_lchown(fname,

diff --git a/rsync.h b/rsync.h
index cf018bb..9e3eba1 100644 (file)
--- a/rsync.h
+++ b/rsync.h
@@ -362,6 +362,8 @@ enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 };
 #define IN_LOOPBACKNET 127
 #endif
 
+#define GID_NONE (gid_t) -1
+
 struct file_struct {
        unsigned flags;
        time_t modtime;

diff --git a/uidlist.c b/uidlist.c
index 02d551d..5027e78 100644 (file)
--- a/uidlist.c
+++ b/uidlist.c
@@ -160,7 +160,7 @@ static gid_t match_gid(gid_t gid)
        if (am_root)
                last_out = gid;
        else
-               last_out = (gid_t)-1;
+               last_out = GID_NONE;
        return last_out;
 }
 
@@ -307,7 +307,7 @@ void recv_uid_list(int f, struct file_list *flist)
                        }
                        list->id2 = map_gid(id, name);
                        if (!am_root && !is_in_group(list->id2))
-                               list->id2 = (gid_t)-1;
+                               list->id2 = GID_NONE;
                        free(name);
                }
        }