diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2001-04-26 09:22:28 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2001-04-26 09:22:28 +0000 |
| commit | d12dd1a1b589b9bdcef3cb373d26c7b730a918bc (patch) | |
| tree | fb5f0fb980ce6891975d97637d9592c7e7aa3eb3 /bin/pax/sel_subs.c | |
| parent | 19476d5cacf203e4018e600169e71d0ad011bc18 (diff) | |
| download | src-d12dd1a1b589b9bdcef3cb373d26c7b730a918bc.tar.gz src-d12dd1a1b589b9bdcef3cb373d26c7b730a918bc.zip | |
Whitespace cleanup pass; reduce diffs with OpenBSD. No functional changes.
Notes
Notes:
svn path=/head/; revision=76019
Diffstat (limited to 'bin/pax/sel_subs.c')
| -rw-r--r-- | bin/pax/sel_subs.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/bin/pax/sel_subs.c b/bin/pax/sel_subs.c index 7a8a98b762e3..639e53279043 100644 --- a/bin/pax/sel_subs.c +++ b/bin/pax/sel_subs.c @@ -130,8 +130,8 @@ usr_add(str) return(-1); if ((usrtb == NULL) && ((usrtb = (USRT **)calloc(USR_TB_SZ, sizeof(USRT *))) == NULL)) { - paxwarn(1, "Unable to allocate memory for user selection table"); - return(-1); + paxwarn(1, "Unable to allocate memory for user selection table"); + return(-1); } /* @@ -144,11 +144,11 @@ usr_add(str) if ((str[0] == '\\') && (str[1] == '#')) ++str; if ((pw = getpwnam(str)) == NULL) { - paxwarn(1, "Unable to find uid for user: %s", str); - return(-1); + paxwarn(1, "Unable to find uid for user: %s", str); + return(-1); } uid = (uid_t)pw->pw_uid; - } else + } else # ifdef NET2_STAT uid = (uid_t)atoi(str+1); # else @@ -161,11 +161,11 @@ usr_add(str) */ indx = ((unsigned)uid) % USR_TB_SZ; if ((pt = usrtb[indx]) != NULL) { - while (pt != NULL) { - if (pt->uid == uid) + while (pt != NULL) { + if (pt->uid == uid) return(0); - pt = pt->fow; - } + pt = pt->fow; + } } /* @@ -177,8 +177,8 @@ usr_add(str) usrtb[indx] = pt; return(0); } - paxwarn(1, "User selection table out of memory"); - return(-1); + paxwarn(1, "User selection table out of memory"); + return(-1); } /* @@ -243,8 +243,8 @@ grp_add(str) return(-1); if ((grptb == NULL) && ((grptb = (GRPT **)calloc(GRP_TB_SZ, sizeof(GRPT *))) == NULL)) { - paxwarn(1, "Unable to allocate memory fo group selection table"); - return(-1); + paxwarn(1, "Unable to allocate memory fo group selection table"); + return(-1); } /* @@ -257,11 +257,11 @@ grp_add(str) if ((str[0] == '\\') && (str[1] == '#')) ++str; if ((gr = getgrnam(str)) == NULL) { - paxwarn(1,"Cannot determine gid for group name: %s", str); - return(-1); + paxwarn(1,"Cannot determine gid for group name: %s", str); + return(-1); } gid = (gid_t)gr->gr_gid; - } else + } else # ifdef NET2_STAT gid = (gid_t)atoi(str+1); # else @@ -274,11 +274,11 @@ grp_add(str) */ indx = ((unsigned)gid) % GRP_TB_SZ; if ((pt = grptb[indx]) != NULL) { - while (pt != NULL) { - if (pt->gid == gid) + while (pt != NULL) { + if (pt->gid == gid) return(0); - pt = pt->fow; - } + pt = pt->fow; + } } /* @@ -290,8 +290,8 @@ grp_add(str) grptb[indx] = pt; return(0); } - paxwarn(1, "Group selection table out of memory"); - return(-1); + paxwarn(1, "Group selection table out of memory"); + return(-1); } /* |