1 files changed, 15 insertions, 15 deletions

diff --git a/util/memory.c b/util/memory.c
index 4370c72ec..9f9f6c81f 100644
--- a/util/memory.c
+++ b/util/memory.c
@@ -123,20 +123,19 @@ static void check_allmem( const char *info );
 static void
 add_entry( byte *p, unsigned n, int mode, const char *info, const char *by )
 {
-    unsigned index;
+    unsigned idx;
     struct memtbl_entry *e;
     struct info_entry *ie;
 
     if( memtbl_len < memtbl_size  )
-	index = memtbl_len++;
+	idx = memtbl_len++;
     else {
-	struct memtbl_entry *e;
 	/* look for a used entry in the table.	We take the first one,
 	 * so that freed entries remain as long as possible in the table
 	 * (free appends a new one)
 	 */
 	if( (e = memtbl_unused) ) {
-	    index = e - memtbl;
+	    idx = e - memtbl;
 	    memtbl_unused = e->next;
 	    e->next = NULL;
 	}
@@ -145,32 +144,33 @@ add_entry( byte *p, unsigned n, int mode, const char *info, const char *by )
 		memtbl_size = 100;
 		if( !(memtbl = calloc( memtbl_size, sizeof *memtbl )) )
 		    membug("memory debug table malloc failed\n");
-		index = 0;
+		idx = 0;
 		memtbl_len = 1;
 		atexit( dump_table_at_exit );
 	    }
 	    else { /* realloc */
-		unsigned n = memtbl_size / 4; /* enlarge by 25% */
-		if(!(memtbl = realloc(memtbl, (memtbl_size+n)*sizeof *memtbl)))
+		unsigned nn = memtbl_size / 4; /* enlarge by 25% */
+		if(!(memtbl = realloc(memtbl, (memtbl_size+nn)*sizeof *memtbl)))
 		    membug("memory debug table realloc failed\n");
 		memset(memtbl+memtbl_size, 0, n*sizeof *memtbl );
-		memtbl_size += n;
-		index = memtbl_len++;
+		memtbl_size += nn;
+		idx = memtbl_len++;
 	    }
 	}
     }
-    e = memtbl+index;
+    e = memtbl+idx;
     if( e->inuse )
-	membug("Ooops: entry %u is flagged as in use\n", index);
+	membug("Ooops: entry %u is flagged as in use\n", idx);
     e->user_p = p + 4;
     e->user_n = n;
     e->count++;
     if( e->next )
 	membug("Ooops: entry is in free entry list\n");
     /* do we already have this info string */
-    for( ie = info_strings[info_hash(info)]; ie; ie = ie->next )
+    for( ie = info_strings[info_hash(info)]; ie; ie = ie->next ) {
 	if( ie->info == info )
 	    break;
+    }
     if( !ie ) { /* no: make a new entry */
 	if( !(ie = malloc( sizeof *ie )) )
 	    membug("can't allocate info entry\n");
@@ -184,9 +184,9 @@ add_entry( byte *p, unsigned n, int mode, const char *info, const char *by )
     e->inuse = 1;
 
     /* put the index at the start of the memory */
-    p[0] = index;
-    p[1] = index >> 8 ;
-    p[2] = index >> 16 ;
+    p[0] = idx;
+    p[1] = idx >> 8 ;
+    p[2] = idx >> 16 ;
     p[3] = mode? MAGIC_SEC_BYTE : MAGIC_NOR_BYTE  ;
     if( DBG_MEMORY )
 	log_debug( "%s allocates %u bytes using %s\n", info, e->user_n, by );