Add -Wshadow and deal with the warnings.

lib/asn1/asn1_print.c

@@ -174,12 +174,11 @@ loop (unsigned char *buf, size_t len, int indent)
 		printf ("(length %lu), ", (unsigned long)length);
 
 		if (inner_flag) {
-		    Der_class class;
-		    Der_type type;
-		    unsigned int tag;
+		    Der_class c;
+		    Der_type ty;
+		    unsigned int ta;
 
-		    ret = der_get_tag(str.data, str.length,
-				      &class, &type, &tag, &sz);
+		    ret = der_get_tag(str.data, str.length, &c, &ty, &ta, &sz);
 		    if (ret || sz > str.length ||
 			type != CONS || tag != UT_Sequence)
 			goto just_an_octet_string;

lib/asn1/gen_template.c

@@ -807,7 +807,7 @@ generate_template_type(const char *varname,
 		       int optional, int isstruct, int need_offset)
 {
     struct tlist *tl;
-    const char *dup;
+    const char *d;
     int have_ellipsis = 0;
 
     tl = tlist_new(varname);
@@ -831,11 +831,11 @@ generate_template_type(const char *varname,
 		 have_ellipsis ? "|A1_HF_ELLIPSIS" : "",
 		 isstruct ? "struct " : "", basetype, tlist_count(tl));
 
-    dup = tlist_find_dup(tl);
-    if (dup) {
-	if (strcmp(dup, tl->name) == 0)
+    d = tlist_find_dup(tl);
+    if (d) {
+	if (strcmp(d, tl->name) == 0)
 	    errx(1, "found dup of ourself");
-	*dupname = dup;
+	*dupname = d;
     } else {
 	*dupname = tl->name;
 	tlist_print(tl);

lib/asn1/template.c

@@ -150,7 +150,7 @@ bmember_put_bit(unsigned char *p, const void *data, unsigned int bit,
 
 int
 _asn1_decode(const struct asn1_template *t, unsigned flags,
-	     const unsigned char *p, size_t len, void *data, size_t *size)
+	     const unsigned char *p, size_t len, void *data, size_t *retsize)
 {
     size_t elements = A1_HEADER_LEN(t);
     size_t oldlen = len;
@@ -348,7 +348,7 @@ _asn1_decode(const struct asn1_template *t, unsigned flags,
 	case A1_OP_BMEMBER: {
 	    const struct asn1_template *bmember = t->ptr;
 	    size_t size = bmember->offset;
-	    size_t elements = A1_HEADER_LEN(bmember);
+	    size_t els = A1_HEADER_LEN(bmember);
 	    size_t pos = 0;
 
 	    bmember++;
@@ -359,7 +359,7 @@ _asn1_decode(const struct asn1_template *t, unsigned flags,
 		return ASN1_OVERRUN;
 	    p++; len--;
 
-	    while (elements && len) {
+	    while (els && len) {
 		while (bmember->offset / 8 > pos / 8) {
 		    if (len < 1)
 			break;
@@ -368,7 +368,7 @@ _asn1_decode(const struct asn1_template *t, unsigned flags,
 		}
 		if (len) {
 		    bmember_get_bit(p, data, bmember->offset, size);
-		    elements--; bmember++;
+		    els--; bmember++;
 		}
 	    }
 	    len = 0;
@@ -419,8 +419,8 @@ _asn1_decode(const struct asn1_template *t, unsigned flags,
 
     oldlen -= len;
 
-    if (size)
-	*size = oldlen;
+    if (retsize)
+	*retsize = oldlen;
 
     /*
      * saved the raw bits if asked for it, useful for signature
@@ -441,7 +441,8 @@ _asn1_decode(const struct asn1_template *t, unsigned flags,
 }
 
 int
-_asn1_encode(const struct asn1_template *t, unsigned char *p, size_t len, const void *data, size_t *size)
+_asn1_encode(const struct asn1_template *t, unsigned char *p, size_t len,
+	     const void *data, size_t *retsize)
 {
     size_t elements = A1_HEADER_LEN(t);
     int ret = 0;
@@ -616,20 +617,20 @@ _asn1_encode(const struct asn1_template *t, unsigned char *p, size_t len, const
 	case A1_OP_BMEMBER: {
 	    const struct asn1_template *bmember = t->ptr;
 	    size_t size = bmember->offset;
-	    size_t elements = A1_HEADER_LEN(bmember);
+	    size_t els = A1_HEADER_LEN(bmember);
 	    size_t pos;
 	    unsigned char c = 0;
 	    unsigned int bitset = 0;
 	    int rfc1510 = (bmember->tt & A1_HBF_RFC1510);
 
-	    bmember += elements;
+	    bmember += els;
 
 	    if (rfc1510)
 		pos = 31;
 	    else
 		pos = bmember->offset;
 
-	    while (elements && len) {
+	    while (els && len) {
 		while (bmember->offset / 8 < pos / 8) {
 		    if (rfc1510 || bitset || c) {
 			if (len < 1)
@@ -640,7 +641,7 @@ _asn1_encode(const struct asn1_template *t, unsigned char *p, size_t len, const
 		    pos -= 8;
 		}
 		bmember_put_bit(&c, data, bmember->offset, size, &bitset);
-		elements--; bmember--;
+		els--; bmember--;
 	    }
 	    if (rfc1510 || bitset) {
 		if (len < 1)
@@ -690,8 +691,8 @@ _asn1_encode(const struct asn1_template *t, unsigned char *p, size_t len, const
 	t--;
 	elements--;
     }
-    if (size)
-	*size = oldlen - len;
+    if (retsize)
+	*retsize = oldlen - len;
 
     return 0;
 }
@@ -773,7 +774,7 @@ _asn1_length(const struct asn1_template *t, const void *data)
 	case A1_OP_BMEMBER: {
 	    const struct asn1_template *bmember = t->ptr;
 	    size_t size = bmember->offset;
-	    size_t elements = A1_HEADER_LEN(bmember);
+	    size_t els = A1_HEADER_LEN(bmember);
 	    int rfc1510 = (bmember->tt & A1_HBF_RFC1510);
 
 	    if (rfc1510) {
@@ -782,14 +783,14 @@ _asn1_length(const struct asn1_template *t, const void *data)
 
 		ret += 1;
 
-		bmember += elements;
+		bmember += els;
 
-		while (elements) {
+		while (els) {
 		    if (bmember_isset_bit(data, bmember->offset, size)) {
 			ret += (bmember->offset / 8) + 1;
 			break;
 		    }
-		    elements--; bmember--;
+		    els--; bmember--;
 		}
 	    }
 	    break;

lib/gssapi/test_context.c

@@ -501,7 +501,7 @@ usage (int ret)
 int
 main(int argc, char **argv)
 {
-    int optind = 0;
+    int optidx = 0;
     OM_uint32 min_stat, maj_stat;
     gss_ctx_id_t cctx, sctx;
     void *ctx;
@@ -519,7 +519,7 @@ main(int argc, char **argv)
 
     cctx = sctx = GSS_C_NO_CONTEXT;
 
-    if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optind))
+    if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optidx))
 	usage(1);
 
     if (help_flag)
@@ -530,8 +530,8 @@ main(int argc, char **argv)
 	exit(0);
     }
 
-    argc -= optind;
-    argv += optind;
+    argc -= optidx;
+    argv += optidx;
 
     if (argc != 1)
 	usage(1);
@@ -644,7 +644,7 @@ main(int argc, char **argv)
 
     /* XXX should be actual_mech */
     if (gss_oid_equal(mechoid, GSS_KRB5_MECHANISM)) {
-	time_t time;
+	time_t sc_time;
 	gss_buffer_desc authz_data;
 	gss_buffer_desc in, out1, out2;
 	krb5_keyblock *keyblock, *keyblock2;
@@ -685,15 +685,15 @@ main(int argc, char **argv)
 
  	maj_stat = gsskrb5_extract_authtime_from_sec_context(&min_stat,
 							     sctx,
-							     &time);
+							     &sc_time);
 	if (maj_stat != GSS_S_COMPLETE)
 	    errx(1, "gsskrb5_extract_authtime_from_sec_context failed: %s",
 		     gssapi_err(maj_stat, min_stat, actual_mech));
 
-	if (time > now)
+	if (sc_time > now)
 	    errx(1, "gsskrb5_extract_authtime_from_sec_context failed: "
 		 "time authtime is before now: %ld %ld",
-		 (long)time, (long)now);
+		 (long)sc_time, (long)now);
 
  	maj_stat = gsskrb5_extract_service_keyblock(&min_stat,
 						    sctx,

lib/gssapi/test_ntlm.c

@@ -309,11 +309,11 @@ usage (int ret)
 int
 main(int argc, char **argv)
 {
-    int ret = 0, optind = 0;
+    int ret = 0, optidx = 0;
 
     setprogname(argv[0]);
 
-    if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optind))
+    if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optidx))
 	usage(1);
 
     if (help_flag)
@@ -324,8 +324,8 @@ main(int argc, char **argv)
 	exit(0);
     }
 
-    argc -= optind;
-    argv += optind;
+    argc -= optidx;
+    argv += optidx;
 
     ret += test_libntlm_v1(0);
     ret += test_libntlm_v1(NTLM_NEG_KEYEX);

lib/hdb/hdb-sqlite.c

@@ -792,7 +792,7 @@ hdb_sqlite_remove(krb5_context context, HDB *db,
     krb5_error_code ret;
     char *principal_string;
     hdb_sqlite_db *hsdb = (hdb_sqlite_db*)(db->hdb_db);
-    sqlite3_stmt *remove = hsdb->remove;
+    sqlite3_stmt *rm = hsdb->remove;
 
     ret = krb5_unparse_name(context, principal, &principal_string);
     if (ret) {
@@ -800,9 +800,9 @@ hdb_sqlite_remove(krb5_context context, HDB *db,
         return ret;
     }
 
-    sqlite3_bind_text(remove, 1, principal_string, -1, SQLITE_STATIC);
+    sqlite3_bind_text(rm, 1, principal_string, -1, SQLITE_STATIC);
 
-    ret = hdb_sqlite_step(context, hsdb->db, remove);
+    ret = hdb_sqlite_step(context, hsdb->db, rm);
     if (ret != SQLITE_DONE) {
 	ret = EINVAL;
         krb5_set_error_message(context, ret,
@@ -811,8 +811,8 @@ hdb_sqlite_remove(krb5_context context, HDB *db,
     } else
         ret = 0;
 
-    sqlite3_clear_bindings(remove);
-    sqlite3_reset(remove);
+    sqlite3_clear_bindings(rm);
+    sqlite3_reset(rm);
 
     return ret;
 }

lib/ipc/tc.c

@@ -60,7 +60,7 @@ usage(int ret)
 }
 
 static void
-reply(void *ctx, int errorcode, heim_idata *reply, heim_icred cred)
+reply(void *ctx, int errorcode, heim_idata *rep, heim_icred cred)
 {
     printf("got reply\n");
     heim_ipc_semaphore_signal((heim_isemaphore)ctx); /* tell caller we are done */

lib/kadm5/randkey_c.c

@@ -110,7 +110,6 @@ kadm5_c_randkey_principal(void *server_handle,
     ret = tmp;
     if(ret == 0){
 	krb5_keyblock *k;
-	int i;
 
 	krb5_ret_int32(sp, &tmp);
 	if (tmp < 0) {

lib/krb5/scache.c

@@ -309,7 +309,6 @@ scc_alloc(krb5_context context, const char *name)
 	char *file;
 
 	if (*name == '\0') {
-	    krb5_error_code ret;
 	    ret = get_def_name(context, &s->name);
 	    if (ret)
 		s->name = strdup(SCACHE_DEF_NAME);

lib/krb5/test_alname.c

@@ -138,7 +138,6 @@ main(int argc, char **argv)
     if (simple_flag) {
 	krb5_principal princ;
 	char *unparsed;
-	krb5_error_code ret;
 	int status = 0;
 
 	/* Map then print the result and exit */

lib/roken/ndbm_wrap.c

@@ -111,20 +111,20 @@ static datum
 dbm_get (DB *db, int flags)
 {
     DBT key, value;
-    datum datum;
+    datum d;
 #ifdef HAVE_DB3
     if(cursor == NULL)
 	db->cursor(db, NULL, &cursor, 0);
     if(cursor->c_get(cursor, &key, &value, flags) != 0) {
-	datum.dptr = NULL;
-	datum.dsize = 0;
+	d.dptr = NULL;
+	d.dsize = 0;
     } else
-	DBT2DATUM(&value, &datum);
+	DBT2DATUM(&value, &d);
 #else
     db->seq(db, &key, &value, flags);
-    DBT2DATUM(&value, &datum);
+    DBT2DATUM(&value, &d);
 #endif
-    return datum;
+    return d;
 }
 
 #ifndef DB_FIRST

lib/roken/resolve-test.c

@@ -150,25 +150,25 @@ main(int argc, char **argv)
 	    }
 	    case rk_ns_t_sshfp : {
 		struct rk_sshfp_record *sshfp = rr->u.sshfp;
-		size_t i;
+		size_t j;
 
 		printf ("alg %u type %u length %lu data ", sshfp->algorithm,
 			sshfp->type,  (unsigned long)sshfp->sshfp_len);
-		for (i = 0; i < sshfp->sshfp_len; i++)
-		    printf("%02X", sshfp->sshfp_data[i]);
+		for (j = 0; j < sshfp->sshfp_len; j++)
+		    printf("%02X", sshfp->sshfp_data[j]);
 		printf("\n");
 
 		break;
 	    }
 	    case rk_ns_t_ds : {
 		struct rk_ds_record *ds = rr->u.ds;
-		size_t i;
+		size_t j;
 
 		printf ("key tag %u alg %u type %u length %lu data ",
 			ds->key_tag, ds->algorithm, ds->digest_type,
 			(unsigned long)ds->digest_len);
-		for (i = 0; i < ds->digest_len; i++)
-		    printf("%02X", ds->digest_data[i]);
+		for (j = 0; j < ds->digest_len; j++)
+		    printf("%02X", ds->digest_data[j]);
 		printf("\n");
 
 		break;