From 8a244c607a3f35cf641e88fcd8bca49e57af1bf9 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@justemail.net>
Date: Fri, 4 Mar 2016 20:22:27 +0000
Subject: [PATCH] Renaming three variables.

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5709 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---
 ChangeLog    |  1 +
 src/global.c | 83 ++++++++++++++++++++++++++--------------------------
 2 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8b75a222..5562b65f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
 	for when opening multiple files.  Instead stop calling malloc().
 	* src/nano.h: Delete a now-unused struct member.
 	* src/global.c (free_list_item): Elide this now too tiny function.
+	* scr/global.c (thanks_for_all_the_fish): Rename three variables.
 
 2016-03-01  Benno Schulenberg  <bensberg@justemail.net>
 	* src/rcfile.c (parse_syntax), src/color.c (color_update): Don't
diff --git a/src/global.c b/src/global.c
index 6c962653..fb0fc8c6 100644
--- a/src/global.c
+++ b/src/global.c
@@ -1667,48 +1667,49 @@ void thanks_for_all_the_fish(void)
 #ifndef DISABLE_COLOR
     free(syntaxstr);
     while (syntaxes != NULL) {
-	syntaxtype *bill = syntaxes;
-
-	free(syntaxes->name);
-	free(syntaxes->linter);
-	free(syntaxes->formatter);
-
-	while (syntaxes->extensions != NULL) {
-	    regexlisttype *bob = syntaxes->extensions;
-	    syntaxes->extensions = bob->next;
-	    free(bob->full_regex);
-	    free(bob);
-	}
-	while (syntaxes->headers != NULL) {
-	    regexlisttype *bob = syntaxes->headers;
-	    syntaxes->headers = bob->next;
-	    free(bob->full_regex);
-	    free(bob);
-	}
-	while (syntaxes->magics != NULL) {
-	    regexlisttype *bob = syntaxes->magics;
-	    syntaxes->magics = bob->next;
-	    free(bob->full_regex);
-	    free(bob);
-	}
-
-	while (syntaxes->color != NULL) {
-	    colortype *bob = syntaxes->color;
-	    syntaxes->color = bob->next;
-	    free(bob->start_regex);
-	    if (bob->start != NULL) {
-		regfree(bob->start);
-		free(bob->start);
-	    }
-	    free(bob->end_regex);
-	    if (bob->end != NULL) {
-		regfree(bob->end);
-		free(bob->end);
-	    }
-	    free(bob);
-	}
+	syntaxtype *sint = syntaxes;
 	syntaxes = syntaxes->next;
-	free(bill);
+
+	free(sint->name);
+	free(sint->linter);
+	free(sint->formatter);
+
+	while (sint->extensions != NULL) {
+	    regexlisttype *item = sint->extensions;
+	    sint->extensions = sint->extensions->next;
+	    free(item->full_regex);
+	    free(item);
+	}
+	while (sint->headers != NULL) {
+	    regexlisttype *item = sint->headers;
+	    sint->headers = sint->headers->next;
+	    free(item->full_regex);
+	    free(item);
+	}
+	while (sint->magics != NULL) {
+	    regexlisttype *item = sint->magics;
+	    sint->magics = sint->magics->next;
+	    free(item->full_regex);
+	    free(item);
+	}
+
+	while (sint->color != NULL) {
+	    colortype *ink = sint->color;
+	    sint->color = sint->color->next;
+	    free(ink->start_regex);
+	    if (ink->start != NULL) {
+		regfree(ink->start);
+		free(ink->start);
+	    }
+	    free(ink->end_regex);
+	    if (ink->end != NULL) {
+		regfree(ink->end);
+		free(ink->end);
+	    }
+	    free(ink);
+	}
+
+	free(sint);
     }
 #endif /* !DISABLE_COLOR */
 #ifndef DISABLE_HISTORIES