mirror/rsync
1
0
Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-04-17 12:47:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Silence a few more warnings.

Browse Source
This commit is contained in:
Wayne Davison
2020-09-29 15:51:03 -07:00
parent cd018c7a4c
commit b115bc8a5d
2 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/sysacls.c
View File

@@ -1739,7 +1739,6 @@ int sys_acl_free_acl(SMB_ACL_T acl_d)
int sys_acl_get_entry(SMB_ACL_T theacl, int entry_id, SMB_ACL_ENTRY_T *entry_p)
{
struct acl_entry_link *link;
struct new_acl_entry *entry;
int keep_going;
if (entry_id == SMB_ACL_FIRST_ENTRY)
@@ -1765,10 +1764,15 @@ int sys_acl_get_entry(SMB_ACL_T theacl, int entry_id, SMB_ACL_ENTRY_T *entry_p)
for (keep_going = 0; keep_going < theacl->count; keep_going++)
link = link->nextp;
entry = *entry_p = link->entryp;
*entry_p = link->entryp;
DEBUG(10, ("*entry_p is %d\n", entry_p));
DEBUG(10, ("*entry_p->ace_access is %d\n", entry->ace_access));
#if 0
{
struct new_acl_entry *entry = *entry_p;
DEBUG(10, ("*entry_p is %lx\n", (long)entry));
DEBUG(10, ("*entry_p->ace_access is %d\n", entry->ace_access));
}
#endif
/* Increment count */
theacl->count++;
@@ -2297,7 +2301,7 @@ int sys_acl_create_entry(SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry)
{
struct acl_entry_link *theacl;
struct acl_entry_link *acl_entryp;
struct acl_entry_link *temp_entry;
struct acl_entry_link *temp_entry = NULL;
int counting;
DEBUG(10, ("Entering the sys_acl_create_entry\n"));

26
uidlist.c
View File

@@ -63,6 +63,16 @@ struct idlist {
static struct idlist *uidlist, *uidmap;
static struct idlist *gidlist, *gidmap;
static inline int id_eq_uid(id_t id, uid_t uid)
{
return id == (id_t)uid;
}
static inline int id_eq_gid(id_t id, gid_t gid)
{
return id == (id_t)gid;
}
static id_t id_parse(const char *num_str)
{
id_t tmp, num = 0;
@@ -263,10 +273,10 @@ static struct idlist *recv_add_id(struct idlist **idlist_ptr, struct idlist *idm
else if (*name && id) {
if (idlist_ptr == &uidlist) {
uid_t uid;
id2 = user_to_uid(name, &uid, False) ? uid : id;
id2 = user_to_uid(name, &uid, False) ? (id_t)uid : id;
} else {
gid_t gid;
id2 = group_to_gid(name, &gid, False) ? gid : id;
id2 = group_to_gid(name, &gid, False) ? (id_t)gid : id;
}
} else
id2 = id;
@@ -289,11 +299,11 @@ uid_t match_uid(uid_t uid)
static struct idlist *last = NULL;
struct idlist *list;
if (last && uid == last->id)
if (last && id_eq_uid(last->id, uid))
return last->id2;
for (list = uidlist; list; list = list->next) {
if (list->id == uid)
if (id_eq_uid(list->id, uid))
break;
}
@@ -309,11 +319,11 @@ gid_t match_gid(gid_t gid, uint16 *flags_ptr)
static struct idlist *last = NULL;
struct idlist *list;
if (last && gid == last->id)
if (last && id_eq_gid(last->id, gid))
list = last;
else {
for (list = gidlist; list; list = list->next) {
if (list->id == gid)
if (id_eq_gid(list->id, gid))
break;
}
if (!list)
@@ -334,7 +344,7 @@ const char *add_uid(uid_t uid)
union name_or_id noiu;
for (list = uidlist; list; list = list->next) {
if (list->id == uid)
if (id_eq_uid(list->id, uid))
return NULL;
}
@@ -351,7 +361,7 @@ const char *add_gid(gid_t gid)
union name_or_id noiu;
for (list = gidlist; list; list = list->next) {
if (list->id == gid)
if (id_eq_gid(list->id, gid))
return NULL;
}