ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tweaks: condense some code, to remove a bit of duplication

master
Benno Schulenberg 2018-03-23 17:12:55 +01:00
parent 206d89b739
commit ab8698df47
1 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/nano.c
View File

@ -586,6 +586,7 @@ void finish(void)
void die(const char *msg, ...) void die(const char *msg, ...)
{ {
va_list ap; va_list ap;
openfilestruct *firstone = openfile;
curs_set(1); curs_set(1);
endwin(); endwin();
@ -597,38 +598,27 @@ void die(const char *msg, ...)
vfprintf(stderr, msg, ap); vfprintf(stderr, msg, ap);
va_end(ap); va_end(ap);
while (openfile) {
#ifndef NANO_TINY #ifndef NANO_TINY
/* If the current buffer has a lockfile, remove it. */ /* If the current buffer has a lockfile, remove it. */
if (openfile && ISSET(LOCKING) && openfile->lock_filename) if (ISSET(LOCKING) && openfile->lock_filename)
delete_lockfile(openfile->lock_filename); delete_lockfile(openfile->lock_filename);
#endif #endif
/* If the current file buffer was modified, save it. */
if (openfile->modified) {
/* If the buffer is partitioned, unpartition it first. */
if (filepart != NULL)
unpartition_filestruct(&filepart);
/* If the current file buffer was modified, save it. */ die_save_file(openfile->filename, openfile->current_stat);
if (openfile && openfile->modified) {
/* If the buffer is partitioned, unpartition it first. */
if (filepart != NULL)
unpartition_filestruct(&filepart);
die_save_file(openfile->filename, openfile->current_stat);
}
#ifdef ENABLE_MULTIBUFFER
/* Save all of the other modified file buffers, if any. */
if (openfile != NULL) {
openfilestruct *firstone = openfile;
while (openfile->next != firstone) {
openfile = openfile->next;
#ifndef NANO_TINY
if (ISSET(LOCKING) && openfile->lock_filename)
delete_lockfile(openfile->lock_filename);
#endif
if (openfile->modified)
die_save_file(openfile->filename, openfile->current_stat);
} }
filepart = NULL;
openfile = openfile->next;
if (openfile == firstone)
break;
} }
#endif
/* Abandon the building. */ /* Abandon the building. */
exit(1); exit(1);