d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libc/nss tests: Style

Browse Source 
Sponsored by:	The FreeBSD Foundation
MFC after:	1 month
This commit is contained in:
Mark Johnston 2021-01-21 14:30:18 -05:00
parent aa37baf3d7
commit ed14c69d56
3 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/libc/tests/nss/getgr_test.c
View File

@ -62,8 +62,7 @@ static void free_group(struct group *);
static void sdump_group(struct group *, char *, size_t);
static int group_read_snapshot_func(struct group *, char *);
static int group_check_ambiguity(struct group_test_data *,
struct group *);
static int group_check_ambiguity(struct group_test_data *, struct group *);
static int group_fill_test_data(struct group_test_data *);
static int group_test_correctness(struct group *, void *);
static int group_test_getgrnam(struct group *, void *);
@ -340,8 +339,8 @@ static int
group_check_ambiguity(struct group_test_data *td, struct group *pwd)
{
return (TEST_DATA_FIND(group, td, pwd, compare_group,
NULL) != NULL ? 0 : -1);
return (TEST_DATA_FIND(group, td, pwd, compare_group, NULL) !=
NULL ? 0 : -1);
}
static int
@ -377,18 +376,19 @@ group_test_getgrgid(struct group *grp_model, void *mdata)
grp = getgrgid(grp_model->gr_gid);
if (group_test_correctness(grp, NULL) != 0 ||
(compare_group(grp, grp_model, NULL) != 0 &&
group_check_ambiguity((struct group_test_data *)mdata, grp) != 0)) {
group_check_ambiguity((struct group_test_data *)mdata, grp) != 0))
return (-1);
} else {
else
return (0);
}
}
static int
group_test_getgrent(struct group *grp, void *mdata __unused)
{
/* Only correctness can be checked when doing 1-pass test for
* getgrent(). */
/*
* Only correctness can be checked when doing 1-pass test for
* getgrent().
*/
return (group_test_correctness(grp, NULL));
}

23
lib/libc/tests/nss/getpw_test.c
View File

@ -302,8 +302,8 @@ static int
passwd_check_ambiguity(struct passwd_test_data *td, struct passwd *pwd)
{
return (TEST_DATA_FIND(passwd, td, pwd, compare_passwd,
NULL) != NULL ? 0 : -1);
return (TEST_DATA_FIND(passwd, td, pwd, compare_passwd, NULL) !=
NULL ? 0 : -1);
}
static int
@ -320,9 +320,8 @@ passwd_test_getpwnam(struct passwd *pwd_model, void *mdata)
if (passwd_test_correctness(pwd, NULL) != 0)
goto errfin;
if ((compare_passwd(pwd, pwd_model, NULL) != 0) &&
(passwd_check_ambiguity((struct passwd_test_data *)mdata, pwd)
!=0))
if (compare_passwd(pwd, pwd_model, NULL) != 0 &&
passwd_check_ambiguity((struct passwd_test_data *)mdata, pwd) != 0)
goto errfin;
#ifdef DEBUG
@ -348,10 +347,10 @@ passwd_test_getpwuid(struct passwd *pwd_model, void *mdata)
#endif
pwd = getpwuid(pwd_model->pw_uid);
if ((passwd_test_correctness(pwd, NULL) != 0) ||
((compare_passwd(pwd, pwd_model, NULL) != 0) &&
(passwd_check_ambiguity((struct passwd_test_data *)mdata, pwd)
!= 0))) {
if (passwd_test_correctness(pwd, NULL) != 0 ||
(compare_passwd(pwd, pwd_model, NULL) != 0 &&
passwd_check_ambiguity((struct passwd_test_data *)mdata,
pwd) != 0)) {
#ifdef DEBUG
printf("not ok\n");
#endif
@ -367,8 +366,10 @@ passwd_test_getpwuid(struct passwd *pwd_model, void *mdata)
static int
passwd_test_getpwent(struct passwd *pwd, void *mdata __unused)
{
/* Only correctness can be checked when doing 1-pass test for
* getpwent(). */
/*
* Only correctness can be checked when doing 1-pass test for
* getpwent().
*/
return (passwd_test_correctness(pwd, NULL));
}