first pass attempt at cleaning up some gcc -Wall flames

(see ChangeLogs for gory details)

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

10 files changed, 35 insertions, 13 deletions

diff --git a/src/lib/krb5/keytab/ChangeLog b/src/lib/krb5/keytab/ChangeLog
index 92102b647..28c40dce2 100644
--- a/src/lib/krb5/keytab/ChangeLog
+++ b/src/lib/krb5/keytab/ChangeLog
@@ -1,3 +1,11 @@
+Fri Aug  4 21:48:41 1995  Tom Yu  <tlyu@dragons-lair.MIT.EDU>
+
+	* read_servi.c (krb5_kt_read_service_key): add more parens to shut
+		up gcc -Wall
+
+	* ktdefault.c (krb5_kt_default): add more parens to shut up gcc
+		-Wall
+
 Fri Jun  9 19:33:33 1995    <tytso@rsx-11.mit.edu>
 
 	* configure.in: Remove standardized set of autoconf macros, which
diff --git a/src/lib/krb5/keytab/file/ChangeLog b/src/lib/krb5/keytab/file/ChangeLog
index 16ec9bf5b..ad1ce9f97 100644
--- a/src/lib/krb5/keytab/file/ChangeLog
+++ b/src/lib/krb5/keytab/file/ChangeLog
@@ -1,3 +1,16 @@
+Fri Aug  4 21:51:32 1995  Tom Yu  <tlyu@dragons-lair.MIT.EDU>
+
+	* ktf_util.c: shut up gcc -Wall
+
+	* ktf_remove.c: more stuff to shut up gcc -Wall
+
+	* ktf_next.c: Add more parens to shut up gcc -Wall
+
+	* ktf_g_ent.c (krb5_ktfile_get_entry): Add more parens to shut up
+		gcc -Wall
+
+	* ktf_add.c (krb5_ktfile_add): Add parens to shut up gcc -Wall
+
 Wed Jun 28 12:05:34 1995    <tytso@rsx-11.mit.edu>
 
 	* ktf_g_ent.c (krb5_ktfile_get_entry): If the key version number
diff --git a/src/lib/krb5/keytab/file/ktf_add.c b/src/lib/krb5/keytab/file/ktf_add.c
index 0de762918..aac429c04 100644
--- a/src/lib/krb5/keytab/file/ktf_add.c
+++ b/src/lib/krb5/keytab/file/ktf_add.c
@@ -35,7 +35,7 @@ krb5_ktfile_add(context, id, entry)
 {
     krb5_error_code retval;
 
-    if (retval = krb5_ktfileint_openw(context, id))
+    if ((retval = krb5_ktfileint_openw(context, id)))
 	return retval;
     if (fseek(KTFILEP(id), 0, 2) == -1)
 	return KRB5_KT_END;
diff --git a/src/lib/krb5/keytab/file/ktf_g_ent.c b/src/lib/krb5/keytab/file/ktf_g_ent.c
index f05f0bd48..7f6120bbd 100644
--- a/src/lib/krb5/keytab/file/ktf_g_ent.c
+++ b/src/lib/krb5/keytab/file/ktf_g_ent.c
@@ -42,7 +42,7 @@ krb5_ktfile_get_entry(context, id, principal, kvno, keytype, entry)
     krb5_error_code kerror = 0;
 
     /* Open the keyfile for reading */
-    if (kerror = krb5_ktfileint_openr(context, id))
+    if ((kerror = krb5_ktfileint_openr(context, id)))
 	return(kerror);
     
     /* 
@@ -53,7 +53,7 @@ krb5_ktfile_get_entry(context, id, principal, kvno, keytype, entry)
     cur_entry.vno = 0;
     cur_entry.key.contents = 0;
     while (TRUE) {
-	if (kerror = krb5_ktfileint_read_entry(context, id, &new_entry))
+	if ((kerror = krb5_ktfileint_read_entry(context, id, &new_entry)))
 	    break;
 
 	if (krb5_principal_compare(context, principal, new_entry.principal)) {
diff --git a/src/lib/krb5/keytab/file/ktf_next.c b/src/lib/krb5/keytab/file/ktf_next.c
index da23bb934..7b13ede5a 100644
--- a/src/lib/krb5/keytab/file/ktf_next.c
+++ b/src/lib/krb5/keytab/file/ktf_next.c
@@ -40,7 +40,7 @@ krb5_kt_cursor *cursor;
 
     if (fseek(KTFILEP(id), *fileoff, 0) == -1)
 	return KRB5_KT_END;
-    if (kerror = krb5_ktfileint_read_entry(context, id, &cur_entry))
+    if ((kerror = krb5_ktfileint_read_entry(context, id, &cur_entry)))
 	return kerror;
     *fileoff = ftell(KTFILEP(id));
     *entry = cur_entry;
diff --git a/src/lib/krb5/keytab/file/ktf_remove.c b/src/lib/krb5/keytab/file/ktf_remove.c
index 93704300a..a58cc1056 100644
--- a/src/lib/krb5/keytab/file/ktf_remove.c
+++ b/src/lib/krb5/keytab/file/ktf_remove.c
@@ -37,7 +37,7 @@ krb5_keytab_entry *entry;
     krb5_error_code     kerror;
     krb5_int32          delete_point;
 
-    if (kerror = krb5_ktfileint_openw(context, id)) {
+    if ((kerror = krb5_ktfileint_openw(context, id))) {
 	return kerror;
     }
 
@@ -46,8 +46,9 @@ krb5_keytab_entry *entry;
      * is exited with a break statement.
      */
     while (TRUE) {
-	if (kerror = krb5_ktfileint_internal_read_entry(context, id, &cur_entry,
-                                                            &delete_point))
+	if ((kerror = krb5_ktfileint_internal_read_entry(context, id,
+							 &cur_entry,
+							 &delete_point)))
   	    break;
 
 	if ((entry->vno == cur_entry.vno) &&
diff --git a/src/lib/krb5/keytab/file/ktf_ssget.c b/src/lib/krb5/keytab/file/ktf_ssget.c
index 67e3bb649..1001b2ee7 100644
--- a/src/lib/krb5/keytab/file/ktf_ssget.c
+++ b/src/lib/krb5/keytab/file/ktf_ssget.c
@@ -36,7 +36,7 @@ krb5_kt_cursor *cursorp;
     krb5_error_code retval;
     long *fileoff;
 
-    if (retval = krb5_ktfileint_openr(context, id))
+    if ((retval = krb5_ktfileint_openr(context, id)))
 	return retval;
 
     if (!(fileoff = (long *)malloc(sizeof(*fileoff)))) {
diff --git a/src/lib/krb5/keytab/file/ktf_util.c b/src/lib/krb5/keytab/file/ktf_util.c
index fa79ef0a0..cc738d924 100644
--- a/src/lib/krb5/keytab/file/ktf_util.c
+++ b/src/lib/krb5/keytab/file/ktf_util.c
@@ -122,8 +122,8 @@ int mode;
 	} else				/* some other error */
 	    return errno;
     }
-    if (kerror = krb5_lock_file(context, KTFILEP(id), KTFILENAME(id),
-				mode)) {
+    if ((kerror = krb5_lock_file(context, KTFILEP(id), KTFILENAME(id),
+				 mode))) {
 	(void) fclose(KTFILEP(id));
 	KTFILEP(id) = 0;
 	return kerror;
@@ -737,7 +737,7 @@ krb5_int32 *commit_point;
                  */
                 zero_point = ftell(KTFILEP(id));
                 setbuf(KTFILEP(id), iobuf);
-                while (size = xfread(iobuf, 1, sizeof(iobuf), KTFILEP(id))) {
+                while ((size = xfread(iobuf, 1, sizeof(iobuf), KTFILEP(id)))) {
                     if (size != sizeof(iobuf)) {
                         remainder = size % sizeof(krb5_int32);
                         if (remainder) {
diff --git a/src/lib/krb5/keytab/ktdefault.c b/src/lib/krb5/keytab/ktdefault.c
index 868153553..1e34b76ce 100644
--- a/src/lib/krb5/keytab/ktdefault.c
+++ b/src/lib/krb5/keytab/ktdefault.c
@@ -35,7 +35,7 @@ krb5_kt_default(context, id)
     char defname[BUFSIZ];
     krb5_error_code retval;
 
-    if (retval = krb5_kt_default_name(context, defname, sizeof(defname)))
+    if ((retval = krb5_kt_default_name(context, defname, sizeof(defname))))
 	return retval;
     return krb5_kt_resolve(context, defname, id);
 }
diff --git a/src/lib/krb5/keytab/read_servi.c b/src/lib/krb5/keytab/read_servi.c
index bd9331ece..e18d199b4 100644
--- a/src/lib/krb5/keytab/read_servi.c
+++ b/src/lib/krb5/keytab/read_servi.c
@@ -67,7 +67,7 @@ krb5_kt_read_service_key(context, keyprocarg, principal, vno, keytype, key)
 		       sizeof(keytabname) - 1);
     }
 
-    if (kerror = krb5_kt_resolve(context, (char *)keytabname, &id))
+    if ((kerror = krb5_kt_resolve(context, (char *)keytabname, &id)))
 	return (kerror);
 
     kerror = krb5_kt_get_entry(context, id, principal, vno, keytype, &entry);