From 077b294463eb6819c0eba67bb8ce71ec66d61ba8 Mon Sep 17 00:00:00 2001
From: Thiemo Seufer <ths@networkno.de>
Date: Thu, 27 Oct 2005 21:22:42 +0000
Subject: [PATCH] 0.9.6.1: 	Code cleanup, don't use 'free' as variable
 name.

---
 src/runtime/backtrace.c |    8 ++++----
 src/runtime/dynbind.c   |    6 ++----
 src/runtime/gc-common.c |    2 +-
 src/runtime/monitor.c   |   18 +++++++++---------
 src/runtime/parse.c     |    8 ++++----
 version.lisp-expr       |    2 +-
 6 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/runtime/backtrace.c b/src/runtime/backtrace.c
index 07af8fe..b4503ad 100644
--- a/src/runtime/backtrace.c
+++ b/src/runtime/backtrace.c
@@ -165,7 +165,7 @@ previous_info(struct call_info *info)
 {
     struct call_frame *this_frame;
     struct thread *thread=arch_os_get_current_thread();
-    int free;
+    int free_ici;
 
     if (!cs_valid_pointer_p(info->frame)) {
         printf("Bogus callee value (0x%08lx).\n", (unsigned long)info->frame);
@@ -182,10 +182,10 @@ previous_info(struct call_info *info)
 
     if (info->lra == NIL) {
         /* We were interrupted. Find the correct signal context. */
-        free = SymbolValue(FREE_INTERRUPT_CONTEXT_INDEX,thread)>>2;
-        while (free-- > 0) {
+        free_ici = fixnum_value(SymbolValue(FREE_INTERRUPT_CONTEXT_INDEX,thread));
+        while (free_ici-- > 0) {
             os_context_t *context =
-                thread->interrupt_contexts[free];
+                thread->interrupt_contexts[free_ici];
             if ((struct call_frame *)(unsigned long)
                     (*os_context_register_addr(context, reg_CFP))
                 == info->frame) {
diff --git a/src/runtime/dynbind.c b/src/runtime/dynbind.c
index da22189..d9774d6 100644
--- a/src/runtime/dynbind.c
+++ b/src/runtime/dynbind.c
@@ -33,7 +33,6 @@
 
 void bind_variable(lispobj symbol, lispobj value, void *th)
 {
-    lispobj old_tl_value;
     struct binding *binding;
     struct thread *thread=(struct thread *)th;
     binding = GetBSP();
@@ -59,10 +58,9 @@ void bind_variable(lispobj symbol, lispobj value, void *th)
         }
     }
 #endif
-    old_tl_value=SymbolTlValue(symbol,thread);
-    binding->value = old_tl_value;
+    binding->value = SymbolTlValue(symbol, thread);
     binding->symbol = symbol;
-    SetTlSymbolValue(symbol, value,thread);
+    SetTlSymbolValue(symbol, value, thread);
 }
 
 void
diff --git a/src/runtime/gc-common.c b/src/runtime/gc-common.c
index 251aa6a..4d2ef2b 100644
--- a/src/runtime/gc-common.c
+++ b/src/runtime/gc-common.c
@@ -127,8 +127,8 @@ scavenge(lispobj *start, long n_words)
     lispobj *end = start + n_words;
     lispobj *object_ptr;
     long n_words_scavenged;
-    for (object_ptr = start;
 
+    for (object_ptr = start;
          object_ptr < end;
          object_ptr += n_words_scavenged) {
 
diff --git a/src/runtime/monitor.c b/src/runtime/monitor.c
index b59bf4e..69d0380 100644
--- a/src/runtime/monitor.c
+++ b/src/runtime/monitor.c
@@ -352,31 +352,31 @@ print_context(os_context_t *context)
 static void
 print_context_cmd(char **ptr)
 {
-    int free;
+    int free_ici;
     struct thread *thread=arch_os_get_current_thread();
 
-    free = SymbolValue(FREE_INTERRUPT_CONTEXT_INDEX,thread)>>2;
+    free_ici = fixnum_value(SymbolValue(FREE_INTERRUPT_CONTEXT_INDEX,thread));
 
     if (more_p(ptr)) {
         int index;
 
         index = parse_number(ptr);
 
-        if ((index >= 0) && (index < free)) {
-            printf("There are %d interrupt contexts.\n", free);
+        if ((index >= 0) && (index < free_ici)) {
+            printf("There are %d interrupt contexts.\n", free_ici);
             printf("printing context %d\n", index);
             print_context(thread->interrupt_contexts[index]);
         } else {
             printf("There aren't that many/few contexts.\n");
-            printf("There are %d interrupt contexts.\n", free);
+            printf("There are %d interrupt contexts.\n", free_ici);
         }
     } else {
-        if (free == 0)
+        if (free_ici == 0)
             printf("There are no interrupt contexts!\n");
         else {
-            printf("There are %d interrupt contexts.\n", free);
-            printf("printing context %d\n", free - 1);
-            print_context(thread->interrupt_contexts[free - 1]);
+            printf("There are %d interrupt contexts.\n", free_ici);
+            printf("printing context %d\n", free_ici - 1);
+            print_context(thread->interrupt_contexts[free_ici - 1]);
         }
     }
 }
diff --git a/src/runtime/parse.c b/src/runtime/parse.c
index 62a0f59..a74b11f 100644
--- a/src/runtime/parse.c
+++ b/src/runtime/parse.c
@@ -318,18 +318,18 @@ char **ptr;
         throw_to_monitor();
     } else if (token[0] == '$') {
         if (isalpha(token[1])) {
-            int free;
+            int free_ici;
             int regnum;
             os_context_t *context;
 
-            free = SymbolValue(FREE_INTERRUPT_CONTEXT_INDEX,thread)>>2;
+            free_ici = fixnum_value(SymbolValue(FREE_INTERRUPT_CONTEXT_INDEX,thread));
 
-            if (free == 0) {
+            if (free_ici == 0) {
                 printf("Variable ``%s'' is not valid -- there is no current interrupt context.\n", token);
                 throw_to_monitor();
             }
 
-            context = thread->interrupt_contexts[free - 1];
+            context = thread->interrupt_contexts[free_ici - 1];
 
             regnum = parse_regnum(token);
             if (regnum < 0) {
diff --git a/version.lisp-expr b/version.lisp-expr
index 45a296d..468e7f2 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.9.6"
+"0.9.6.1"
-- 
1.7.10.4