diff --git a/ChangeLog b/ChangeLog index 8b75a2229af43a0860342839fde74be4d4941f61..5562b65f47f5c8ded04a02104c0e2f79d9d06e39 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 6c962653a05234ca802e6bb5829c31af240b7285..fb0fc8c6780b11ba93be193bd4740ea0b06cc881 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; + syntaxtype *sint = syntaxes; + syntaxes = syntaxes->next; - free(syntaxes->name); - free(syntaxes->linter); - free(syntaxes->formatter); + free(sint->name); + free(sint->linter); + free(sint->formatter); - while (syntaxes->extensions != NULL) { - regexlisttype *bob = syntaxes->extensions; - syntaxes->extensions = bob->next; - free(bob->full_regex); - free(bob); + while (sint->extensions != NULL) { + regexlisttype *item = sint->extensions; + sint->extensions = sint->extensions->next; + free(item->full_regex); + free(item); } - while (syntaxes->headers != NULL) { - regexlisttype *bob = syntaxes->headers; - syntaxes->headers = bob->next; - free(bob->full_regex); - free(bob); + while (sint->headers != NULL) { + regexlisttype *item = sint->headers; + sint->headers = sint->headers->next; + free(item->full_regex); + free(item); } - while (syntaxes->magics != NULL) { - regexlisttype *bob = syntaxes->magics; - syntaxes->magics = bob->next; - free(bob->full_regex); - free(bob); + while (sint->magics != NULL) { + regexlisttype *item = sint->magics; + sint->magics = sint->magics->next; + free(item->full_regex); + free(item); } - 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); + 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(bob->end_regex); - if (bob->end != NULL) { - regfree(bob->end); - free(bob->end); + free(ink->end_regex); + if (ink->end != NULL) { + regfree(ink->end); + free(ink->end); } - free(bob); + free(ink); } - syntaxes = syntaxes->next; - free(bill); + + free(sint); } #endif /* !DISABLE_COLOR */ #ifndef DISABLE_HISTORIES