General -Wall warning cleanup, part I.

Submitted-By: Kent Vander Velden <graphix@iastate.edu>

4 files changed, 14 insertions, 8 deletions

diff --git a/lib/libskey/skey.h b/lib/libskey/skey.h
index 039da4e..6cf9d95 100644
--- a/lib/libskey/skey.h
+++ b/lib/libskey/skey.h
@@ -25,9 +25,14 @@ void f __P((char *x));
 int keycrunch __P((char *result,char *seed,char *passwd));
 char *btoe __P((char *engout,char *c));
 char *put8 __P((char *out,char *s));
+int atob8 __P((char *out, char *in));
+int btoa8 __P((char *out, char *in));
+int htoi __P((char c));
 int etob __P((char *out,char *e));
+void sevenbit __P((char *s));
 void rip __P((char *buf));
 int skeychallenge __P((struct skey *mp,char *name, char *challenge));
+int skeyinfo __P((struct skey *mp, char* name, char *ss));
 int skeylookup __P((struct skey *mp,char *name));
 int skeyverify __P((struct skey *mp,char *response));
 
diff --git a/lib/libskey/skeyaccess.c b/lib/libskey/skeyaccess.c
index 3cb707f..b257646 100644
--- a/lib/libskey/skeyaccess.c
+++ b/lib/libskey/skeyaccess.c
@@ -80,6 +80,8 @@ struct login_info {
     char   *port;			/* login port */
 };
 
+static int _skeyaccess __P(( FILE *, struct login_info * ));
+
 /* skeyaccess - find out if UNIX passwords are permitted */
 
 int     skeyaccess(user, port, host, addr)
@@ -157,14 +159,14 @@ char   *addr;
 
 /* _skeyaccess - find out if UNIX passwords are permitted */
 
-int     _skeyaccess(fp, login_info)
+static int _skeyaccess(fp, login_info)
 FILE   *fp;
 struct login_info *login_info;
 {
     char    buf[BUFSIZ];
     char   *tok;
     int     match;
-    int     permission;
+    int     permission=DENY;
 
 #ifdef PERMIT_CONSOLE
     if (login_info->port != 0 && strcasecmp(login_info->port, CONSOLE) == 0)
@@ -313,7 +315,7 @@ static char *get_token()
 {
     char   *cp;
 
-    if (cp = prev_token) {
+    if ( (cp = prev_token) ) {
 	prev_token = 0;
     } else {
 	while ((cp = strsep(&line_pointer, " \t")) != NULL && *cp == '\0')
diff --git a/lib/libskey/skeylogin.c b/lib/libskey/skeylogin.c
index ee9c277..1d48988 100644
--- a/lib/libskey/skeylogin.c
+++ b/lib/libskey/skeylogin.c
@@ -12,6 +12,7 @@
 
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -174,16 +175,12 @@ skeyverify(mp,response)
 struct skey *mp;
 char *response;
 {
- struct timeval startval;
- struct timeval endval;
 	char key[8];
 	char fkey[8];
 	char filekey[8];
 	time_t now;
 	struct tm *tm;
-	char tbuf[27],buf[60];
-	char me[80];
-	int rval;
+	char tbuf[27];
 	char *cp, *p;
 
 	time(&now);
@@ -266,6 +263,7 @@ char *response;
 /* Convert 8-byte hex-ascii string to binary array
  * Returns 0 on success, -1 on error
  */
+int
 atob8(out,in)
 register char *out,*in;
 {
diff --git a/lib/libskey/skeysubr.c b/lib/libskey/skeysubr.c
index 68564cf..2bd344f 100644
--- a/lib/libskey/skeysubr.c
+++ b/lib/libskey/skeysubr.c
@@ -118,6 +118,7 @@ int n;
 	return buf;
 }
 
+void
 sevenbit(s)
 char *s;
 {