acl-api.c (dovecot-2.3.16) | : | acl-api.c (dovecot-2.3.17) | ||
---|---|---|---|---|
skipping to change at line 463 | skipping to change at line 463 | |||
int acl_rights_cmp(const struct acl_rights *r1, const struct acl_rights *r2) | int acl_rights_cmp(const struct acl_rights *r1, const struct acl_rights *r2) | |||
{ | { | |||
int ret; | int ret; | |||
if (r1->global != r2->global) { | if (r1->global != r2->global) { | |||
/* globals have higher priority than locals */ | /* globals have higher priority than locals */ | |||
return r1->global ? 1 : -1; | return r1->global ? 1 : -1; | |||
} | } | |||
ret = r1->id_type - r2->id_type; | ret = (int)r1->id_type - (int)r2->id_type; | |||
if (ret != 0) | if (ret != 0) | |||
return ret; | return ret; | |||
return null_strcmp(r1->identifier, r2->identifier); | return null_strcmp(r1->identifier, r2->identifier); | |||
} | } | |||
void acl_rights_sort(struct acl_object *aclobj) | void acl_rights_sort(struct acl_object *aclobj) | |||
{ | { | |||
struct acl_rights *rights; | struct acl_rights *rights; | |||
unsigned int i, dest, count; | unsigned int i, dest, count; | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added |