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

tweaks: reduce the scope of two variables, and rename them too 

This reduction is possible since the routine no longer loops when
it encounters a +NUMBER argument.
master
Benno Schulenberg 2017-06-18 11:06:58 +02:00
parent bee670424e
commit 40d34862fd
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/nano.c
View File

@ -2534,13 +2534,13 @@ int main(int argc, char **argv)
/* Read the named files on the command line into new buffers. */
{
ssize_t iline = 0, icol = 0;
while (optind < argc && (!openfile || ISSET(MULTIBUFFER))) {
ssize_t givenline = 0, givencol = 0;
/* If there's a +LINE or +LINE,COLUMN flag here, it is followed
* by at least one other argument: the filename it applies to. */
if (optind < argc - 1 && argv[optind][0] == '+') {
if (!parse_line_column(&argv[optind++][1], &iline, &icol))
if (!parse_line_column(&argv[optind++][1], &givenline, &givencol))
statusline(ALERT, _("Invalid line or column number"));
}
/* If opening fails, don't try to position the cursor. */
@ -2548,11 +2548,8 @@ int main(int argc, char **argv)
continue;
/* If a position was given on the command line, go there. */
if (iline > 0 || icol > 0) {
do_gotolinecolumn(iline, icol, FALSE, FALSE);
iline = 0;
icol = 0;
}
if (givenline > 0 || givencol > 0)
do_gotolinecolumn(givenline, givencol, FALSE, FALSE);
#ifndef DISABLE_HISTORIES
else if (ISSET(POS_HISTORY)) {
ssize_t savedposline, savedposcol;