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

tweaks: add two comments, and reduce the scope of another variable

master
Benno Schulenberg 2019-01-27 11:17:42 +01:00
parent 77c60201d5
commit b89540218d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/nano.c
View File

@ -2303,7 +2303,7 @@ int main(int argc, char **argv)
#ifdef ENABLE_NANORC #ifdef ENABLE_NANORC
if (!ignore_rcfiles) { if (!ignore_rcfiles) {
/* Back up the command-line options, then clear the strings. */ /* Back up the command-line options that take an argument. */
#ifdef ENABLED_WRAPORJUSTIFY #ifdef ENABLED_WRAPORJUSTIFY
ssize_t fill_cmdline = fill; ssize_t fill_cmdline = fill;
#endif #endif
@ -2321,11 +2321,12 @@ int main(int argc, char **argv)
char *alt_speller_cmdline = alt_speller; char *alt_speller_cmdline = alt_speller;
#endif #endif
ssize_t tabsize_cmdline = tabsize; ssize_t tabsize_cmdline = tabsize;
unsigned flags_cmdline[sizeof(flags) / sizeof(flags[0])];
size_t i;
/* Back up the command-line flags. */
unsigned flags_cmdline[sizeof(flags) / sizeof(flags[0])];
memcpy(flags_cmdline, flags, sizeof(flags_cmdline)); memcpy(flags_cmdline, flags, sizeof(flags_cmdline));
/* Clear the string options, to not overwrite the specified ones. */
#ifndef NANO_TINY #ifndef NANO_TINY
backup_dir = NULL; backup_dir = NULL;
word_chars = NULL; word_chars = NULL;
@ -2339,7 +2340,6 @@ int main(int argc, char **argv)
#ifdef ENABLE_SPELLER #ifdef ENABLE_SPELLER
alt_speller = NULL; alt_speller = NULL;
#endif #endif
/* Now process the system's and the user's nanorc file, if any. */ /* Now process the system's and the user's nanorc file, if any. */
do_rcfiles(); do_rcfiles();
@ -2385,7 +2385,7 @@ int main(int argc, char **argv)
tabsize = tabsize_cmdline; tabsize = tabsize_cmdline;
/* Simply OR the boolean flags from rcfile and command line. */ /* Simply OR the boolean flags from rcfile and command line. */
for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) for (size_t i = 0; i < sizeof(flags) / sizeof(flags[0]); i++)
flags[i] |= flags_cmdline[i]; flags[i] |= flags_cmdline[i];
} }
#endif /* ENABLE_NANORC */ #endif /* ENABLE_NANORC */