summaryrefslogtreecommitdiffstats
path: root/chpass/chpass.h
diff options
context:
space:
mode:
authorPhilippe Charnier <charnier@FreeBSD.org>2004-01-18 21:46:39 +0000
committerPhilippe Charnier <charnier@FreeBSD.org>2004-01-18 21:46:39 +0000
commit73461538c2a564f3992725609929618b698e9701 (patch)
treeaec4e4cec78802852b4e042295d2c69dc8a9384d /chpass/chpass.h
parentcae6d992ea1343a8e952c86544cb57eb32a1788d (diff)
downloadpw-darwin-73461538c2a564f3992725609929618b698e9701.tar.gz
pw-darwin-73461538c2a564f3992725609929618b698e9701.tar.zst
pw-darwin-73461538c2a564f3992725609929618b698e9701.zip
Remove unused includes. Make it WARNS=6 friendly. Concerning bin/2442, make
a new function dup_shell() to replace ok_shell() and make it unconditionnally strdup() its result to make the caller's code simplier. Change ok_shell() to just return an integer value suitable for tests (it was used mainly for that purpose). Do not use strdup() in the caller's code but rely on dup_shell() that will do the job for us. PR: bin/2442
Diffstat (limited to 'chpass/chpass.h')
-rw-r--r--chpass/chpass.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/chpass/chpass.h b/chpass/chpass.h
index b78b85e..ed1a586 100644
--- a/chpass/chpass.h
+++ b/chpass/chpass.h
@@ -64,7 +64,8 @@ extern int master_mode;
int atot(char *, time_t *);
struct passwd *edit(const char *, struct passwd *);
-char *ok_shell(char *);
+int ok_shell(char *);
+char *dup_shell(char *);
int p_change(char *, struct passwd *, ENTRY *);
int p_class(char *, struct passwd *, ENTRY *);
int p_expire(char *, struct passwd *, ENTRY *);
@@ -72,7 +73,6 @@ int p_gecos(char *, struct passwd *, ENTRY *);
int p_gid(char *, struct passwd *, ENTRY *);
int p_hdir(char *, struct passwd *, ENTRY *);
int p_login(char *, struct passwd *, ENTRY *);
-int p_login(char *, struct passwd *, ENTRY *);
int p_passwd(char *, struct passwd *, ENTRY *);
int p_shell(char *, struct passwd *, ENTRY *);
int p_uid(char *, struct passwd *, ENTRY *);