From 4cdbd1fa1dfdf48fb93afe5a8f3d46873411e9e7 Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Sun, 6 Jan 2008 12:07:42 +0000 Subject: [PATCH] * src/login_nopam.c: Use an ANSI prototype for resolve_hostname() instead of K&R prototype. * src/login_nopam.c: Fix the prototypes of list_match(), user_match(), from_match(), string_match(). There were no parameters in the prototypes. * src/login_nopam.c: Fix the prototypes of the function parameter match_fn of list_match(). --- ChangeLog | 10 ++++++++++ src/login_nopam.c | 15 +++++++-------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index a9ed2dbd..51b4b5b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2008-01-06 Nicolas François + + * src/login_nopam.c: Use an ANSI prototype for resolve_hostname() + instead of K&R prototype. + * src/login_nopam.c: Fix the prototypes of list_match(), + user_match(), from_match(), string_match(). There were no + parameters in the prototypes. + * src/login_nopam.c: Fix the prototypes of the function parameter + match_fn of list_match(). + 2008-01-06 Nicolas François * libmisc/copydir.c: Remove the src parameter of copy_special(). diff --git a/src/login_nopam.c b/src/login_nopam.c index bc2f75d5..858c9c4c 100644 --- a/src/login_nopam.c +++ b/src/login_nopam.c @@ -58,7 +58,6 @@ #endif /* Path name of the access control file. */ - #ifndef TABLE #define TABLE "/etc/login.access" #endif @@ -71,10 +70,11 @@ static char sep[] = ", \t"; /* list-element separator */ #define YES 1 #define NO 0 -static int list_match (); -static int user_match (); -static int from_match (); -static int string_match (); +static int list_match (char *list, const char *item, int (*match_fn) (const char *, const char *)); +static int user_match (const char *tok, const char *string); +static int from_match (const char *tok, const char *string); +static int string_match (const char *tok, const char *string); +static const char *resolve_hostname (const char *string); /* login_access - match username/group and host/tty with access control file */ int login_access (const char *user, const char *from) @@ -137,7 +137,7 @@ int login_access (const char *user, const char *from) } /* list_match - match an item against a list of tokens with exceptions */ -static int list_match (char *list, const char *item, int (*match_fn) ()) +static int list_match (char *list, const char *item, int (*match_fn) (const char *, const char*)) { char *tok; int match = NO; @@ -245,8 +245,7 @@ static int user_match (const char *tok, const char *string) return (NO); } -static const char *resolve_hostname (string) -const char *string; +static const char *resolve_hostname (const char *string) { /* * Resolve hostname to numeric IP address, as suggested