tweaks: reshuffle some lines, one for clarity, others for conciseness

master
Benno Schulenberg 2021-10-07 19:03:26 +02:00
parent bc22b3c876
commit aeae4fb4b9
1 changed files with 8 additions and 9 deletions

View File

@ -2116,9 +2116,10 @@ int do_writeout(bool exiting, bool withprompt)
#endif #endif
while (TRUE) { while (TRUE) {
int response = 0, choice = 0;
functionptrtype func; functionptrtype func;
const char *msg; const char *msg;
int response = 0;
int choice = 0;
#ifndef NANO_TINY #ifndef NANO_TINY
const char *formatstr = (openfile->fmt == DOS_FILE) ? _(" [DOS Format]") : const char *formatstr = (openfile->fmt == DOS_FILE) ? _(" [DOS Format]") :
(openfile->fmt == MAC_FILE) ? _(" [Mac Format]") : ""; (openfile->fmt == MAC_FILE) ? _(" [Mac Format]") : "";
@ -2193,17 +2194,15 @@ int do_writeout(bool exiting, bool withprompt)
} else if (func == backup_file_void) { } else if (func == backup_file_void) {
TOGGLE(MAKE_BACKUP); TOGGLE(MAKE_BACKUP);
continue; continue;
} else if (func == prepend_void) { } else if (func == prepend_void || func == append_void) {
if (strcmp(answer, openfile->filename) == 0) if (func == prepend_void)
given[0] = '\0';
method = (method == PREPEND) ? OVERWRITE : PREPEND; method = (method == PREPEND) ? OVERWRITE : PREPEND;
continue; else
} else if (func == append_void) { method = (method == APPEND) ? OVERWRITE : APPEND;
if (strcmp(answer, openfile->filename) == 0) if (strcmp(answer, openfile->filename) == 0)
given[0] = '\0'; given[0] = '\0';
method = (method == APPEND) ? OVERWRITE : APPEND;
continue; continue;
} } else
#endif #endif
if (func == do_help) if (func == do_help)
continue; continue;