server: Avoid TRUE:FALSE conditional expressions.

This commit is contained in:
Michael Stefaniuc 2012-08-08 10:10:44 +02:00 committed by Alexandre Julliard
parent dfa57c6e97
commit 794ad90982
2 changed files with 5 additions and 5 deletions

View File

@ -90,7 +90,7 @@ extern int sd_is_valid( const struct security_descriptor *sd, data_size_t size )
/* gets the discretionary access control list from a security descriptor */ /* gets the discretionary access control list from a security descriptor */
static inline const ACL *sd_get_dacl( const struct security_descriptor *sd, int *present ) static inline const ACL *sd_get_dacl( const struct security_descriptor *sd, int *present )
{ {
*present = (sd->control & SE_DACL_PRESENT ? TRUE : FALSE); *present = (sd->control & SE_DACL_PRESENT) != 0;
if (sd->dacl_len) if (sd->dacl_len)
return (const ACL *)((const char *)(sd + 1) + return (const ACL *)((const char *)(sd + 1) +
@ -102,7 +102,7 @@ static inline const ACL *sd_get_dacl( const struct security_descriptor *sd, int
/* gets the system access control list from a security descriptor */ /* gets the system access control list from a security descriptor */
static inline const ACL *sd_get_sacl( const struct security_descriptor *sd, int *present ) static inline const ACL *sd_get_sacl( const struct security_descriptor *sd, int *present )
{ {
*present = (sd->control & SE_SACL_PRESENT ? TRUE : FALSE); *present = (sd->control & SE_SACL_PRESENT) != 0;
if (sd->sacl_len) if (sd->sacl_len)
return (const ACL *)((const char *)(sd + 1) + return (const ACL *)((const char *)(sd + 1) +

View File

@ -475,9 +475,9 @@ static struct token *create_token( unsigned primary, const SID *user,
memcpy( &group->sid, groups[i].Sid, FIELD_OFFSET( SID, SubAuthority[((const SID *)groups[i].Sid)->SubAuthorityCount] ) ); memcpy( &group->sid, groups[i].Sid, FIELD_OFFSET( SID, SubAuthority[((const SID *)groups[i].Sid)->SubAuthorityCount] ) );
group->enabled = TRUE; group->enabled = TRUE;
group->def = TRUE; group->def = TRUE;
group->logon = (groups[i].Attributes & SE_GROUP_LOGON_ID) ? TRUE : FALSE; group->logon = (groups[i].Attributes & SE_GROUP_LOGON_ID) != 0;
group->mandatory = (groups[i].Attributes & SE_GROUP_MANDATORY) ? TRUE : FALSE; group->mandatory = (groups[i].Attributes & SE_GROUP_MANDATORY) != 0;
group->owner = groups[i].Attributes & SE_GROUP_OWNER ? TRUE : FALSE; group->owner = (groups[i].Attributes & SE_GROUP_OWNER) != 0;
group->resource = FALSE; group->resource = FALSE;
group->deny_only = FALSE; group->deny_only = FALSE;
list_add_tail( &token->groups, &group->entry ); list_add_tail( &token->groups, &group->entry );