Compiler warning cleanup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6171 dc483132-0cff-0310-8789-dd5450dbe970

9 files changed, 38 insertions, 17 deletions

diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog
index 78d1858fe..95d2c7acd 100644
--- a/src/lib/des425/ChangeLog
+++ b/src/lib/des425/ChangeLog
@@ -1,3 +1,9 @@
+
+Tue Jun 27 15:51:10 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* util.c - Make #endif ansi-compliant.
+	* read_passwd.c - Add signal name parameter to signal handler to
+		conform to prototype.
+
 Mon Jun 26 14:39:18 1995  Sam Hartman  <hartmans@tardis.MIT.EDU>
 
 	* Makefile.in (LDFLAGS): Removed bogus -g.  It breaks on shared
diff --git a/src/lib/des425/read_passwd.c b/src/lib/des425/read_passwd.c
index 3957e4aff..d9f29d72e 100644
--- a/src/lib/des425/read_passwd.c
+++ b/src/lib/des425/read_passwd.c
@@ -39,7 +39,8 @@
 static jmp_buf pwd_jump;
 
 static krb5_sigtype
-intr_routine()
+intr_routine(signo)
+    int signo;
 {
     longjmp(pwd_jump, 1);
     /*NOTREACHED*/
diff --git a/src/lib/des425/util.c b/src/lib/des425/util.c
index 1230cf009..5b88cbc37 100644
--- a/src/lib/des425/util.c
+++ b/src/lib/des425/util.c
@@ -13,7 +13,7 @@
 #ifndef	lint
 static char rcsid_util_c[] =
 "$Header$";
-#endif	lint
+#endif	/* lint */
 
 #include <stdio.h>
 
diff --git a/src/lib/kadm/ChangeLog b/src/lib/kadm/ChangeLog
index 681f3e21f..b0f776e35 100644
--- a/src/lib/kadm/ChangeLog
+++ b/src/lib/kadm/ChangeLog
@@ -1,4 +1,8 @@
 
+Tue Jun 27 15:50:31 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* alt_prof.c - Change filename and hierarchy lists to be const char.
+
+
 Thu Jun 22 11:56:15 EDT 1995	Paul Park	(pjpark@mit.edu)
 	* alt_prof.c - New jacket routines for handling profiles.  This includes
 		the ability to parse certain string values to appropriate types
diff --git a/src/lib/kadm/alt_prof.c b/src/lib/kadm/alt_prof.c
index 0b112bce7..3123bb0f4 100644
--- a/src/lib/kadm/alt_prof.c
+++ b/src/lib/kadm/alt_prof.c
@@ -49,7 +49,7 @@ krb5_aprof_init(fname, envname, acontextp)
     krb5_pointer	*acontextp;
 {
     krb5_error_code	kret;
-    char		*namelist[2];
+    const char		*namelist[2];
     profile_t		profile;
     extern char		*getenv PROTOTYPE((char *));
     
@@ -86,7 +86,7 @@ krb5_aprof_init(fname, envname, acontextp)
 krb5_error_code
 krb5_aprof_getvals(acontext, hierarchy, retdata)
     krb5_pointer	acontext;
-    char		**hierarchy;
+    const char		**hierarchy;
     char		***retdata;
 {
     return(profile_get_values((profile_t) acontext,
@@ -121,7 +121,7 @@ krb5_aprof_getvals(acontext, hierarchy, retdata)
 krb5_error_code
 krb5_aprof_get_deltat(acontext, hierarchy, uselast, deltatp)
     krb5_pointer	acontext;
-    char		**hierarchy;
+    const char		**hierarchy;
     krb5_boolean	uselast;
     krb5_deltat		*deltatp;
 {
@@ -213,7 +213,7 @@ krb5_aprof_get_deltat(acontext, hierarchy, uselast, deltatp)
 krb5_error_code
 krb5_aprof_get_string(acontext, hierarchy, uselast, stringp)
     krb5_pointer	acontext;
-    char		**hierarchy;
+    const char		**hierarchy;
     krb5_boolean	uselast;
     char		**stringp;
 {
@@ -257,7 +257,7 @@ krb5_aprof_get_string(acontext, hierarchy, uselast, stringp)
 krb5_error_code
 krb5_aprof_get_int32(acontext, hierarchy, uselast, intp)
     krb5_pointer	acontext;
-    char		**hierarchy;
+    const char		**hierarchy;
     krb5_boolean	uselast;
     krb5_int32		*intp;
 {
diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog
index 195873cdc..9678a9d2a 100644
--- a/src/lib/krb4/ChangeLog
+++ b/src/lib/krb4/ChangeLog
@@ -1,3 +1,7 @@
+
+Tue Jun 27 15:49:35 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* kparse.c - Change LineNbr to sLineNbr to avoid conflict with kparse.h
+
 Mon Jun 26 14:58:02 1995  Sam Hartman  <hartmans@tardis.MIT.EDU>
 
 	* log.c: Use HAVE_TIME_H not NEED_TIME_H
diff --git a/src/lib/krb4/kparse.c b/src/lib/krb4/kparse.c
index fb4f6e243..e0fc20ceb 100644
--- a/src/lib/krb4/kparse.c
+++ b/src/lib/krb4/kparse.c
@@ -55,7 +55,7 @@ static char *strutol();
 static char *strsave();
 #endif
 
-static int LineNbr=1;		/* current line nbr in parameter file */
+static int sLineNbr=1;		/* current line nbr in parameter file */
 static char ErrorMsg[80];	/* meaningful only when KV_SYNTAX, PS_SYNTAX,
 				 * or PS_BAD_KEYWORD is returned by
 				 * fGetKeywordValue or fGetParameterSet */
@@ -529,7 +529,7 @@ int fUngetChar(ch,fp)
     int ch;
     FILE *fp;
 {
-    if (ch=='\n') LineNbr--;
+    if (ch=='\n') sLineNbr--;
     return(ungetc(ch,fp));
 }
 
@@ -542,7 +542,7 @@ int fGetChar(fp)
     FILE *fp;
 {
     int ch = fgetc(fp);
-    if (ch=='\n') LineNbr++;
+    if (ch=='\n') sLineNbr++;
     return(ch);
 }
 
@@ -675,18 +675,18 @@ main(argc,argv)
         switch (rc) {
 
         case KV_EOL:
-            printf("%s, line %d: nada mas.\n",filename,LineNbr-1);
+            printf("%s, line %d: nada mas.\n",filename,sLineNbr-1);
             break;
 
         case KV_SYNTAX:
             printf("%s, line %d: syntax error: %s\n",
-                   filename,LineNbr,ErrorMsg);
+                   filename,sLineNbr,ErrorMsg);
             while ( ((ch=fGetChar(fp))!=EOF) && (ch!='\n') );
             break;
 
         case KV_OKAY:
             printf("%s, line %d: okay, %s=\"%s\"\n",
-                   filename,LineNbr,key,valu);
+                   filename,sLineNbr,key,valu);
             break;
 
         default:
@@ -733,19 +733,19 @@ main(argc,argv)
         switch (rc) {
 
         case PS_BAD_KEYWORD:
-            printf("%s, line %d: %s\n",filename,LineNbr,ErrorMsg);
+            printf("%s, line %d: %s\n",filename,sLineNbr,ErrorMsg);
             while ( ((ch=fGetChar(fp))!=EOF) && (ch!='\n') );
             break;
 
         case PS_SYNTAX:
             printf("%s, line %d: syntax error: %s\n",
-                   filename,LineNbr,ErrorMsg);
+                   filename,sLineNbr,ErrorMsg);
             while ( ((ch=fGetChar(fp))!=EOF) && (ch!='\n') );
             break;
 
         case PS_OKAY:
             printf("%s, line %d: valid parameter set found:\n",
-                   filename,LineNbr-1);
+                   filename,sLineNbr-1);
             for (i=0; i<PARMCOUNT(kparm); i++) {
                 printf("\t%s = \"%s\"\n",kparm[i].keyword,
                        (kparm[i].value ? kparm[i].value
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 34eb048fe..b22e21e03 100644
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,8 @@
+
+Tue Jun 27 15:48:41 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* read_pwd.c(intr_routine) - Add signal name argument to signal handler
+		to conform to prototype.
+
 Sat Jun 10 23:07:27 1995  Tom Yu  (tlyu@dragons-lair)
 
 	* genaddrs.c: krb5_auth_context redefinitions
diff --git a/src/lib/krb5/os/read_pwd.c b/src/lib/krb5/os/read_pwd.c
index 5da734c50..244925ba8 100644
--- a/src/lib/krb5/os/read_pwd.c
+++ b/src/lib/krb5/os/read_pwd.c
@@ -38,7 +38,8 @@
 static jmp_buf pwd_jump;
 
 static krb5_sigtype
-intr_routine()
+intr_routine(signo)
+    int signo;
 {
     longjmp(pwd_jump, 1);
     /*NOTREACHED*/