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

8 files changed, 76 insertions, 48 deletions

diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog
index 96208547e..9b4889afa 100644
--- a/src/lib/kdb/ChangeLog
+++ b/src/lib/kdb/ChangeLog
@@ -1,3 +1,23 @@
+Fri Aug  4 23:26:22 1995  Tom Yu  <tlyu@dragons-lair.MIT.EDU>
+
+	* setup_mkey.c (krb5_db_setup_mkey_name): Add parens to shut up
+		gcc -Wall
+
+	* fetch_mkey.c (krb5_db_fetch_mkey): Add parens to shut up gcc
+		-Wall
+
+	* verify_mky.c (krb5_db_verify_master_key): Add parens to shut up
+		gcc -Wall
+
+	* kdb_xdr.c: Add parens to shut up gcc -Wall
+
+	* kdb_dbm.c: Add parens to shut up gcc -Wall
+
+	* decrypt_key.c (krb5_dbekd_decrypt_key_data): Add parens to shut
+		up gcc -Wall
+
+	* encrypt_key.c (krb5_dbekd_encrypt_key_data): Add parens to shut
+		up gcc -Wall
 
 Fri Aug 4 16:22:46 EDT 1995	Paul Park	(pjpark@mit.edu)
 	* kdb_xdr,{de,en}crypt_key.c - Use encode/decode macros to [de]serialize
diff --git a/src/lib/kdb/decrypt_key.c b/src/lib/kdb/decrypt_key.c
index f705387fa..25855162b 100644
--- a/src/lib/kdb/decrypt_key.c
+++ b/src/lib/kdb/decrypt_key.c
@@ -56,10 +56,10 @@ krb5_dbekd_decrypt_key_data(context, eblock, key_data, keyblock, keysalt)
     ptr = key_data->key_data_contents[0];
     krb5_kdb_decode_int16(ptr, keyblock->length);
     ptr += 2;
-    if (retval = krb5_decrypt(context, (krb5_pointer) ptr,
-			      (krb5_pointer)keyblock->contents,
-			      key_data->key_data_length[0] - 2, 
-			      eblock, 0)) {
+    if ((retval = krb5_decrypt(context, (krb5_pointer) ptr,
+			       (krb5_pointer)keyblock->contents,
+			       key_data->key_data_length[0] - 2, 
+			       eblock, 0))) {
     	krb5_xfree(keyblock->contents);
 	return retval;
     }
diff --git a/src/lib/kdb/encrypt_key.c b/src/lib/kdb/encrypt_key.c
index 132891a56..bc2b0cb2d 100644
--- a/src/lib/kdb/encrypt_key.c
+++ b/src/lib/kdb/encrypt_key.c
@@ -81,8 +81,9 @@ krb5_dbekd_encrypt_key_data(context, eblock, keyblock, keysalt, keyver,key_data)
 
     krb5_kdb_encode_int16(len, ptr);
     ptr += 2;
-    if (retval = krb5_encrypt(context, (krb5_pointer) tmp.contents,
-			     (krb5_pointer)(ptr), tmp.length, eblock, 0)) {
+    if ((retval = krb5_encrypt(context, (krb5_pointer) tmp.contents,
+			       (krb5_pointer)(ptr), tmp.length,
+			       eblock, 0))) {
 	krb5_xfree(key_data->key_data_contents[0]);
     	krb5_xfree(tmp.contents);
 	return retval;
diff --git a/src/lib/kdb/fetch_mkey.c b/src/lib/kdb/fetch_mkey.c
index 2ef352651..1e1293f2b 100644
--- a/src/lib/kdb/fetch_mkey.c
+++ b/src/lib/kdb/fetch_mkey.c
@@ -71,10 +71,10 @@ krb5_db_fetch_mkey(context, mname, eblock, fromkeyboard, twice, keyfile, salt, k
     if (fromkeyboard) {
 	krb5_data scratch;
 
-	if (retval = krb5_read_password(context, krb5_mkey_pwd_prompt1,
-					twice ? krb5_mkey_pwd_prompt2 : 0,
-					password,
-					&size))
+	if ((retval = krb5_read_password(context, krb5_mkey_pwd_prompt1,
+					 twice ? krb5_mkey_pwd_prompt2 : 0,
+					 password,
+					 &size)))
 	    return(retval);
 
 	pwd.data = password;
diff --git a/src/lib/kdb/kdb_dbm.c b/src/lib/kdb/kdb_dbm.c
index 9cb02a36e..8a3ecc9db 100644
--- a/src/lib/kdb/kdb_dbm.c
+++ b/src/lib/kdb/kdb_dbm.c
@@ -370,7 +370,7 @@ krb5_dbm_db_init(context)
     /*
      * Check for presence of our context, if not present, allocate one.
      */
-    if (kret = k5dbm_init_context(context))
+    if ((kret = k5dbm_init_context(context)))
 	return(kret);
     db_ctx = context->db_context;
 
@@ -498,7 +498,7 @@ krb5_dbm_db_set_name(context, name)
     /*
      * Check for presence of our context, if not present, allocate one.
      */
-    if (kret = k5dbm_init_context(context))
+    if ((kret = k5dbm_init_context(context)))
 	return(kret);
     db_ctx = context->db_context;
     if (name == NULL)
@@ -655,7 +655,7 @@ krb5_dbm_db_end_read(context, age)
     time_t age2;
     krb5_error_code retval;
 
-    if (retval = krb5_dbm_db_get_age(context, NULL, &age2))
+    if ((retval = krb5_dbm_db_get_age(context, NULL, &age2)))
 	return retval;
     if (age2 != age || age == -1) {
 	return KRB5_KDB_DB_CHANGED;
@@ -903,7 +903,7 @@ krb5_dbm_db_destroy(context, dbname)
 	tmpcontext = 0;
 	if (!context->db_context) {
 	    tmpcontext = 1;
-	    if (retval = k5dbm_init_context(context))
+	    if ((retval = k5dbm_init_context(context)))
 		return(retval);
 	}
 	if (KDBM_DATA_EXT(context->db_context) &&
@@ -914,8 +914,8 @@ krb5_dbm_db_destroy(context, dbname)
 	    (retval = destroy_file_suffix(dbname, 
 					  KDBM_INDEX_EXT(context->db_context))))
 		return(retval);
-	if (retval = destroy_file_suffix(dbname,
-					 KDBM_LOCK_EXT(context->db_context)))
+	if ((retval = destroy_file_suffix(dbname,
+					 KDBM_LOCK_EXT(context->db_context))))
 		return(retval);
 	if (tmpcontext) {
 	    k5dbm_clear_context((db_context_t *) context->db_context);
@@ -954,7 +954,7 @@ krb5_dbm_db_rename(context, from, to)
     tmpcontext = 0;
     if (!context->db_context) {
 	tmpcontext = 1;
-	if (retval = k5dbm_init_context(context))
+	if ((retval = k5dbm_init_context(context)))
 	    return(retval);
     }
     if (KDBM_INDEX_EXT(context->db_context)) {
@@ -980,7 +980,7 @@ krb5_dbm_db_rename(context, from, to)
 	goto errout;
     }
 
-    if (retval = krb5_dbm_db_start_update(context, to, &trans))
+    if ((retval = krb5_dbm_db_start_update(context, to, &trans)))
 	goto errout;
     
     if (((!fromdir && !todir) ||
@@ -1042,10 +1042,10 @@ krb5_boolean *more;			/* are there more? */
 
     db_ctx = (db_context_t *) context->db_context;
     for (try = 0; try < KRB5_DBM_MAX_RETRY; try++) {
-	if (retval = krb5_dbm_db_start_read(context, &transaction))
+	if ((retval = krb5_dbm_db_start_read(context, &transaction)))
 	    return(retval);
 
-	if (retval = krb5_dbm_db_lock(context, KRB5_DBM_SHARED))
+	if ((retval = krb5_dbm_db_lock(context, KRB5_DBM_SHARED)))
 	    return(retval);
 
 	if (db_ctx->db_dbm_ctx)
@@ -1062,7 +1062,7 @@ krb5_boolean *more;			/* are there more? */
 	*more = FALSE;
 
 	/* XXX deal with wildcard lookups */
-	if (retval = krb5_encode_princ_dbmkey(context, &key, searchfor))
+	if ((retval = krb5_encode_princ_dbmkey(context, &key, searchfor)))
 	    goto cleanup;
 
 	contents = KDBM_FETCH(db_ctx, db, key);
@@ -1070,7 +1070,8 @@ krb5_boolean *more;			/* are there more? */
 
 	if (contents.dptr == NULL)
 	    found = 0;
-	else if (retval = krb5_decode_princ_contents(context,&contents,entries))
+	else if ((retval = krb5_decode_princ_contents(context,
+						      &contents,entries)))
 	    goto cleanup;
 	else found = 1;
 
@@ -1142,7 +1143,7 @@ krb5_dbm_db_put_principal(context, entries, nentries)
 	errout(KRB5_KDB_DBNOTINITED);
 
     db_ctx = (db_context_t *) context->db_context;
-    if (retval = krb5_dbm_db_lock(context, KRB5_DBM_EXCLUSIVE))
+    if ((retval = krb5_dbm_db_lock(context, KRB5_DBM_EXCLUSIVE)))
 	errout(retval);
 
     if (db_ctx->db_dbm_ctx)
@@ -1161,10 +1162,12 @@ krb5_dbm_db_put_principal(context, entries, nentries)
 
     /* for each one, stuff temps, and do replace/append */
     for (i = 0; i < *nentries; i++) {
-	if (retval = krb5_encode_princ_contents(context, &contents, entries))
+	if ((retval = krb5_encode_princ_contents(context, &contents,
+						 entries)))
 	    break;
 
-	if (retval = krb5_encode_princ_dbmkey(context, &key, entries->princ)) {
+	if ((retval = krb5_encode_princ_dbmkey(context, &key,
+					       entries->princ))) {
 	    krb5_free_princ_contents(context, &contents);
 	    break;
 	}
@@ -1208,7 +1211,7 @@ krb5_dbm_db_delete_principal(context, searchfor, nentries)
 	return KRB5_KDB_DBNOTINITED;
 
     db_ctx = (db_context_t *) context->db_context;
-    if (retval = krb5_dbm_db_lock(context, KRB5_DBM_EXCLUSIVE))
+    if ((retval = krb5_dbm_db_lock(context, KRB5_DBM_EXCLUSIVE)))
 	return(retval);
 
     if (db_ctx->db_dbm_ctx)
@@ -1222,7 +1225,7 @@ krb5_dbm_db_delete_principal(context, searchfor, nentries)
 	}
     }
 
-    if (retval = krb5_encode_princ_dbmkey(context, &key, searchfor))
+    if ((retval = krb5_encode_princ_dbmkey(context, &key, searchfor)))
 	goto cleanup;
 
     contents = KDBM_FETCH(db_ctx, db, key);
@@ -1231,7 +1234,8 @@ krb5_dbm_db_delete_principal(context, searchfor, nentries)
 	*nentries = 0;
     } else {
 	memset((char *)&entry, 0, sizeof(entry));
-	if (retval = krb5_decode_princ_contents(context, &contents, &entry))
+	if ((retval = krb5_decode_princ_contents(context, &contents,
+						 &entry)))
 	    goto cleankey;
 	*nentries = 1;
 	/* Clear encrypted key contents */
@@ -1241,7 +1245,8 @@ krb5_dbm_db_delete_principal(context, searchfor, nentries)
 		       entry.key_data[i].key_data_length[0]); 
 	    }
 	}
-	if (retval = krb5_encode_princ_contents(context, &contents2, &entry))
+	if ((retval = krb5_encode_princ_contents(context, &contents2,
+						 &entry)))
 	    goto cleancontents;
 
 	if (KDBM_STORE(db_ctx, db, key, contents2, DBM_REPLACE))
@@ -1282,7 +1287,7 @@ krb5_dbm_db_iterate (context, func, func_arg)
 	return KRB5_KDB_DBNOTINITED;
 
     db_ctx = (db_context_t *) context->db_context;
-    if (retval = krb5_dbm_db_lock(context, KRB5_DBM_SHARED))
+    if ((retval = krb5_dbm_db_lock(context, KRB5_DBM_SHARED)))
 	return retval;
 
     if (db_ctx->db_dbm_ctx)
@@ -1299,7 +1304,8 @@ krb5_dbm_db_iterate (context, func, func_arg)
     for (key = KDBM_FIRSTKEY (db_ctx, db);
 	 key.dptr != NULL; key = KDBM_NEXTKEY(db_ctx, db)) {
 	contents = KDBM_FETCH (db_ctx, db, key);
-	if (retval = krb5_decode_princ_contents(context, &contents, &entries))
+	if ((retval = krb5_decode_princ_contents(context, &contents,
+						 &entries)))
 	    break;
 	retval = (*func)(func_arg, &entries);
 	krb5_dbe_free_contents(context, &entries);
@@ -1321,7 +1327,7 @@ krb5_dbm_db_set_lockmode(context, mode)
     db_context_t *db_ctx;
 
     old = mode;
-    if (db_ctx = (db_context_t *) context->db_context) {
+    if ((db_ctx = (db_context_t *) context->db_context)) {
 	old = db_ctx->db_nb_locks;
 	db_ctx->db_nb_locks = mode;
     }
diff --git a/src/lib/kdb/kdb_xdr.c b/src/lib/kdb/kdb_xdr.c
index 4507b982f..8aadb2b96 100644
--- a/src/lib/kdb/kdb_xdr.c
+++ b/src/lib/kdb/kdb_xdr.c
@@ -32,13 +32,13 @@ krb5_dbe_create_key_data(context, entry)
     krb5_db_entry	* entry;
 {
     if (entry->n_key_data) {
-	if (entry->key_data = (krb5_key_data *)realloc(entry->key_data, 
-				sizeof(krb5_key_data) * (entry->n_key_data + 1)))
+	if ((entry->key_data = (krb5_key_data *)realloc(entry->key_data, 
+	         sizeof(krb5_key_data) * (entry->n_key_data + 1))))
     	    memset(entry->key_data + entry->n_key_data,0,sizeof(krb5_key_data));
 	else 
 	    return ENOMEM;
     } else { 
-	if (entry->key_data = (krb5_key_data *)malloc(sizeof(krb5_key_data))) 
+	if ((entry->key_data = (krb5_key_data *)malloc(sizeof(krb5_key_data))))
     	    memset(entry->key_data, 0, sizeof(krb5_key_data));
 	else 
 	    return ENOMEM;
@@ -63,8 +63,8 @@ krb5_dbe_encode_mod_princ_data(context, mod_princ, entry)
      * Need 04 bytes for date
      * Need XX bytes for string
      */
-    if (retval = krb5_unparse_name(context, mod_princ->mod_princ, 
-				   &unparse_mod_princ))
+    if ((retval = krb5_unparse_name(context, mod_princ->mod_princ, 
+				   &unparse_mod_princ)))
 	return(retval);
 
     unparse_mod_princ_size = (int) strlen(unparse_mod_princ) + 1;
@@ -124,8 +124,8 @@ krb5_dbe_decode_mod_princ_data(context, entry, mod_princ)
 	    nextloc += 4;
 
 	    /* Mod Princ */
-    	    if (retval = krb5_parse_name(context, (const char *) nextloc, 
-					 &((*mod_princ)->mod_princ))) 
+    	    if ((retval = krb5_parse_name(context, (const char *) nextloc, 
+					 &((*mod_princ)->mod_princ))))
 		break;
     	    if ((strlen((char *) nextloc) + 1 + 4) !=
 		tl_data->tl_data_length) {
@@ -202,7 +202,7 @@ krb5_encode_princ_contents(context, content, entry)
      */
     content->dsize = entry->len + entry->e_length;
 
-    if (retval = krb5_unparse_name(context, entry->princ, &unparse_princ))
+    if ((retval = krb5_unparse_name(context, entry->princ, &unparse_princ)))
 	return(retval);
 
     unparse_princ_size = strlen(unparse_princ) + 1;
@@ -451,7 +451,7 @@ krb5_decode_princ_contents(context, content, entry)
 	/* Check for extra data */
     if (entry->len > KRB5_KDB_V1_BASE_LENGTH) {
 	entry->e_length = entry->len - KRB5_KDB_V1_BASE_LENGTH;
-	if (entry->e_data = (krb5_octet *)malloc(entry->e_length)) {
+	if ((entry->e_data = (krb5_octet *)malloc(entry->e_length))) {
 	    memcpy(entry->e_data, nextloc, entry->e_length);
 	    nextloc += entry->e_length;
 	} else {
@@ -473,7 +473,7 @@ krb5_decode_princ_contents(context, content, entry)
     i = (int) i16;
     nextloc += 2;
 
-    if (retval = krb5_parse_name(context, nextloc, &(entry->princ))) 
+    if ((retval = krb5_parse_name(context, nextloc, &(entry->princ))))
 	goto error_out;
     if ((i != (strlen(nextloc) + 1)) || (sizeleft < i)) {
 	retval = KRB5_KDB_TRUNCATED_RECORD;
diff --git a/src/lib/kdb/setup_mkey.c b/src/lib/kdb/setup_mkey.c
index ece8e2cca..ba1760d5f 100644
--- a/src/lib/kdb/setup_mkey.c
+++ b/src/lib/kdb/setup_mkey.c
@@ -61,7 +61,7 @@ krb5_db_setup_mkey_name(context, keyname, realm, fullname, principal)
     strcat(fname, REALM_SEP_STRING);
     strcat(fname, realm);
 
-    if (retval = krb5_parse_name(context, fname, principal))
+    if ((retval = krb5_parse_name(context, fname, principal)))
 	return retval;
     if (fullname)
 	*fullname = fname;
diff --git a/src/lib/kdb/verify_mky.c b/src/lib/kdb/verify_mky.c
index dbac6ff35..121c72148 100644
--- a/src/lib/kdb/verify_mky.c
+++ b/src/lib/kdb/verify_mky.c
@@ -47,7 +47,8 @@ krb5_db_verify_master_key(context, mprinc, mkey, eblock)
     krb5_keyblock tempkey;
 
     nprinc = 1;
-    if (retval = krb5_db_get_principal(context, mprinc, &master_entry, &nprinc, &more))
+    if ((retval = krb5_db_get_principal(context, mprinc,
+					&master_entry, &nprinc, &more)))
 	return(retval);
 	
     if (nprinc != 1) {
@@ -60,13 +61,13 @@ krb5_db_verify_master_key(context, mprinc, mkey, eblock)
     }	
 
     /* do any necessary key pre-processing */
-    if (retval = krb5_process_key(context, eblock, mkey)) {
+    if ((retval = krb5_process_key(context, eblock, mkey))) {
 	krb5_db_free_principal(context, &master_entry, nprinc);
 	return(retval);
     }
-    if (retval = krb5_dbekd_decrypt_key_data(context, eblock, 
-					     &master_entry.key_data[0],
-					     &tempkey, NULL)) {
+    if ((retval = krb5_dbekd_decrypt_key_data(context, eblock, 
+					      &master_entry.key_data[0],
+					      &tempkey, NULL))) {
 	(void) krb5_finish_key(context, eblock);
 	krb5_db_free_principal(context, &master_entry, nprinc);
 	return retval;