diff options
author | des <des@FreeBSD.org> | 2002-02-06 13:30:31 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2002-02-06 13:30:31 +0000 |
commit | 0f2cb9b020b907000a28323fc57a82fdb7d6626d (patch) | |
tree | d44f2702502c982570c85130c91c845a83ea8052 /usr.bin/chpass | |
parent | 0e1bb965cc26648289a6a22baf0ad5ef4891edb4 (diff) | |
download | FreeBSD-src-0f2cb9b020b907000a28323fc57a82fdb7d6626d.zip FreeBSD-src-0f2cb9b020b907000a28323fc57a82fdb7d6626d.tar.gz |
Apply the following mechanical transformations in preparation for
ansification and constification:
s{\s+__P\((\(.*?\))\)}{$1}g;
s{\(\s+}{\(}g;
s{\s+\)}{\)}g;
s{\s+,}{,}g;
s{(\s+)(for|if|switch|while)\(}{$1$2 \(}g;
s{return ([^\(].*?);}{return ($1);}g;
s{([\w\)])([!=+/\*-]?=)([\w\(+-])}{$1 $2 $3}g;
s{\s+$}{\n};g
Also add $FreeBSD$ where needed.
MFC after: 1 week
Diffstat (limited to 'usr.bin/chpass')
-rw-r--r-- | usr.bin/chpass/pw_yp.c | 8 | ||||
-rw-r--r-- | usr.bin/chpass/pw_yp.h | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/usr.bin/chpass/pw_yp.c b/usr.bin/chpass/pw_yp.c index 1c523ae..921f30e 100644 --- a/usr.bin/chpass/pw_yp.c +++ b/usr.bin/chpass/pw_yp.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * NIS interface routines for chpass - * + * * Written by Bill Paul <wpaul@ctr.columbia.edu> * Center for Telecommunications Research * Columbia University, New York City @@ -41,7 +41,7 @@ #ifdef YP #include <stdio.h> #include <stdlib.h> -#include <string.h> +#include <string.h> #include <netdb.h> #include <time.h> #include <sys/types.h> @@ -307,8 +307,8 @@ int use_yp (user, uid, which) copy_yp_pass(result, 0, resultlen); } /* Is the user in the NIS master.passwd map */ - if (user_yp && !my_yp_match(server, yp_domain, which ? - "master.passwd.byuid" : "master.passwd.byname", + if (user_yp && !my_yp_match(server, yp_domain, which ? + "master.passwd.byuid" : "master.passwd.byname", user, strlen(user), &result, &resultlen)) { *(char *)(result + resultlen) = '\0'; diff --git a/usr.bin/chpass/pw_yp.h b/usr.bin/chpass/pw_yp.h index 15f63d0..774722e 100644 --- a/usr.bin/chpass/pw_yp.h +++ b/usr.bin/chpass/pw_yp.h @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * NIS interface routines for chpass - * + * * Written by Bill Paul <wpaul@ctr.columbia.edu> * Center for Telecommunications Research * Columbia University, New York City @@ -54,12 +54,12 @@ extern int _use_yp; extern int suser_override; extern struct passwd local_password; extern struct passwd yp_password; -extern void copy_yp_pass __P(( char *, int, int )); +extern void copy_yp_pass(char *, int, int); extern char *yp_domain; extern char *yp_server; -extern void yp_submit __P(( struct passwd * )); -extern int use_yp __P(( char * , uid_t , int )); -extern char *get_yp_master __P(( int )); +extern void yp_submit(struct passwd *); +extern int use_yp(char *, uid_t, int); +extern char *get_yp_master(int); extern int yp_in_pw_file; /* |