From: Ezra Peisach <epeisach@mit.edu>
Date: Sun, 12 Apr 2009 15:40:41 +0000 (+0000)
Subject: More dead code elimination.  When asprintf was used the varaible namelen was
X-Git-Tag: krb5-1.8-alpha1~545
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=df68bb9d510c479a8aedf48f73e592f1a3f0f035;p=krb5.git

More dead code elimination.  When asprintf was used the varaible namelen was
no longer necessary.

ticket: 6453
status: open

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

diff --git a/src/lib/krb5/keytab/kt_file.c b/src/lib/krb5/keytab/kt_file.c
index 6e535432c..1d261f8c7 100644
--- a/src/lib/krb5/keytab/kt_file.c
+++ b/src/lib/krb5/keytab/kt_file.c
@@ -635,7 +635,6 @@ krb5_ktf_keytab_externalize(krb5_context kcontext, krb5_pointer arg, krb5_octet
     krb5_int32		file_is_open;
     krb5_int64		file_pos;
     char		*ktname;
-    size_t		namelen;
     const char		*fnamep;
 
     required = 0;
@@ -654,13 +653,10 @@ krb5_ktf_keytab_externalize(krb5_context kcontext, krb5_pointer arg, krb5_octet
 	    file_pos = 0;
 
 	    /* Calculate the length of the name */
-	    namelen = (keytab->ops && keytab->ops->prefix) ?
-		strlen(keytab->ops->prefix)+1 : 0;
 	    if (ktdata && ktdata->name)
 		fnamep = ktdata->name;
 	    else
 		fnamep = ktfile_def_name;
-	    namelen += (strlen(fnamep)+1);
 
 	    if (keytab->ops && keytab->ops->prefix) {
 		if (asprintf(&ktname, "%s:%s", keytab->ops->prefix, fnamep) < 0)
@@ -743,7 +739,6 @@ krb5_ktf_keytab_internalize(krb5_context kcontext, krb5_pointer *argp, krb5_octe
     if (krb5_ser_unpack_int32(&ibuf, &bp, &remain))
 	ibuf = 0;
     if (ibuf == KV5M_KEYTAB) {
-	kret = ENOMEM;
 
 	/* Get the length of the keytab name */
 	kret = krb5_ser_unpack_int32(&ibuf, &bp, &remain);