port over DB's (better) equivalent of the last fix, and tweak a few

comments


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2550 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
David Lawrence Ramsey 2005-05-26 06:09:07 +00:00
parent 5d8d0b19be
commit 40e4acf55e
2 changed files with 9 additions and 3 deletions

View File

@ -72,7 +72,7 @@ CVS code -
only called here anyway. (David Benbennick) only called here anyway. (David Benbennick)
- Fix the code to free all open file buffers to work properly - Fix the code to free all open file buffers to work properly
with the previous overhaul of the multibuffer code instead of with the previous overhaul of the multibuffer code instead of
going into an infinite loop. (DLR) going into an infinite loop. (David Benbennick)
- Add additional checks for variables' not being NULL before we - Add additional checks for variables' not being NULL before we
try to free them, to avoid assertion failures. (DLR) try to free them, to avoid assertion failures. (DLR)
- nano.c: - nano.c:

View File

@ -1208,6 +1208,7 @@ void thanks_for_all_the_fish(void)
free_shortcutage(&gotodir_list); free_shortcutage(&gotodir_list);
#endif #endif
#ifndef NANO_SMALL #ifndef NANO_SMALL
/* Free the memory associated with each toggle. */
while (toggles != NULL) { while (toggles != NULL) {
toggle *t = toggles; toggle *t = toggles;
@ -1217,8 +1218,13 @@ void thanks_for_all_the_fish(void)
#endif #endif
#ifdef ENABLE_MULTIBUFFER #ifdef ENABLE_MULTIBUFFER
/* Free the memory associated with each open file buffer. */ /* Free the memory associated with each open file buffer. */
if (open_files != NULL) if (open_files != NULL) {
/* Make sure open_files->fileage is up to date, in case we've
* cut the top line of the file. */
open_files->fileage = fileage;
free_openfilestruct(open_files); free_openfilestruct(open_files);
}
#else #else
if (fileage != NULL) if (fileage != NULL)
free_filestruct(fileage); free_filestruct(fileage);
@ -1252,7 +1258,7 @@ void thanks_for_all_the_fish(void)
} }
#endif /* ENABLE_COLOR */ #endif /* ENABLE_COLOR */
#ifndef NANO_SMALL #ifndef NANO_SMALL
/* Free the history lists. */ /* Free the search and replace history lists. */
if (searchage != NULL) if (searchage != NULL)
free_filestruct(searchage); free_filestruct(searchage);
if (replaceage != NULL) if (replaceage != NULL)