sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

lib: Simplify two if-expressions

Browse Source 
This version looks easier to read to me.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke 2023-05-23 10:44:40 +02:00 committed by Jeremy Allison
parent 1d6f6f9529
commit 1b7fb13654
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source3/lib/util.c
View File

@ -119,11 +119,8 @@ uint64_t get_file_size_stat(const SMB_STRUCT_STAT *sbuf)
bool check_same_dev_ino(const SMB_STRUCT_STAT *sbuf1,
const SMB_STRUCT_STAT *sbuf2)
{
if (sbuf1->st_ex_dev != sbuf2->st_ex_dev ||
sbuf1->st_ex_ino != sbuf2->st_ex_ino) {
return false;
}
return true;
return ((sbuf1->st_ex_dev == sbuf2->st_ex_dev) &&
(sbuf1->st_ex_ino == sbuf2->st_ex_ino));
}
/****************************************************************************
@ -131,14 +128,11 @@ bool check_same_dev_ino(const SMB_STRUCT_STAT *sbuf1,
****************************************************************************/
bool check_same_stat(const SMB_STRUCT_STAT *sbuf1,
const SMB_STRUCT_STAT *sbuf2)
const SMB_STRUCT_STAT *sbuf2)
{
if (sbuf1->st_ex_uid != sbuf2->st_ex_uid ||
sbuf1->st_ex_gid != sbuf2->st_ex_gid ||
!check_same_dev_ino(sbuf1, sbuf2)) {
return false;
}
return true;
return ((sbuf1->st_ex_uid == sbuf2->st_ex_uid) &&
(sbuf1->st_ex_gid == sbuf2->st_ex_gid) &&
check_same_dev_ino(sbuf1, sbuf2));
}
/*******************************************************************