From 31974aa24c8d805f1cb1436cfa263dfe9c52d1e2 Mon Sep 17 00:00:00 2001
From: Nicolas Williams <nico@cryptonector.com>
Date: Tue, 19 Jul 2011 01:30:42 -0500
Subject: [PATCH] More s/int/size_t/ for iterators.  Also fixed a stupid bug.

---
 lib/hdb/keys.c        | 7 +++----
 lib/hdb/mkey.c        | 4 ++--
 lib/hdb/print.c       | 2 +-
 lib/kadm5/randkey_c.c | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/lib/hdb/keys.c b/lib/hdb/keys.c
index 7ca1ad904..22d45595c 100644
--- a/lib/hdb/keys.c
+++ b/lib/hdb/keys.c
@@ -33,7 +33,6 @@
  */
 
 #include "hdb_locl.h"
-#include <assert.h>
 
 /*
  * free all the memory used by (len, keys)
@@ -42,7 +41,7 @@
 void
 hdb_free_keys(krb5_context context, int len, Key *keys)
 {
-    int i;
+    size_t i;
 
     for (i = 0; i < len; i++) {
 	free(keys[i].mkvno);
@@ -60,7 +59,7 @@ hdb_free_keys(krb5_context context, int len, Key *keys)
 void
 hdb_free_keysets(krb5_context context, int len, hdb_keyset *keysets)
 {
-    int i;
+    size_t i;
 
     for (i = 0; i < len; i++) {
 	hdb_free_keys(context, keysets[i].keys.len, keysets[i].keys.val);
@@ -337,7 +336,7 @@ krb5_error_code
 ks_tuple2str(krb5_context context, int n_ks_tuple,
 	     krb5_key_salt_tuple *ks_tuple, char ***ks_tuple_strs)
 {
-	int i;
+	size_t i;
 	char **ksnames;
 	char *ename, *sname;
 	krb5_error_code rc = KRB5_PROG_ETYPE_NOSUPP;
diff --git a/lib/hdb/mkey.c b/lib/hdb/mkey.c
index dd6255d1a..10804aa53 100644
--- a/lib/hdb/mkey.c
+++ b/lib/hdb/mkey.c
@@ -492,7 +492,7 @@ hdb_unseal_keys_kvno(krb5_context context, HDB *db, krb5_kvno kvno,
     unsigned int tmp_len;
     unsigned int kvno_diff = 0;
     krb5_kvno tmp_kvno;
-    int i, k;
+    size_t i, k;
     int exclude_dead = 0;
     KerberosTime now = 0;
     time_t *set_time;
@@ -518,7 +518,7 @@ hdb_unseal_keys_kvno(krb5_context context, HDB *db, krb5_kvno kvno,
 
     hist_keys = &ext->data.u.hist_keys;
 
-    for (i = hist_keys->len - 1; i >= 0; i++) {
+    for (i = 0; i < hist_keys->len; i++) {
 	if (kvno != 0 && hist_keys->val[i].kvno != kvno)
 	    continue;
 
diff --git a/lib/hdb/print.c b/lib/hdb/print.c
index 0ff767ec6..49d4e7c1b 100644
--- a/lib/hdb/print.c
+++ b/lib/hdb/print.c
@@ -128,7 +128,7 @@ static krb5_error_code
 entry2string_int (krb5_context context, krb5_storage *sp, hdb_entry *ent)
 {
     char *p;
-    int i;
+    size_t i;
     krb5_error_code ret;
 
     /* --- principal */
diff --git a/lib/kadm5/randkey_c.c b/lib/kadm5/randkey_c.c
index 4cb62010f..3626d3fbd 100644
--- a/lib/kadm5/randkey_c.c
+++ b/lib/kadm5/randkey_c.c
@@ -49,7 +49,7 @@ kadm5_c_randkey_principal(void *server_handle,
     krb5_storage *sp;
     unsigned char buf[1536];
     int32_t tmp;
-    int i;
+    size_t i;
     krb5_data reply;
 
     ret = _kadm5_connect(server_handle);