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

Renaming a variable and fusing an increment. 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5693 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2016-02-28 15:47:37 +00:00
parent 1fba31e7b5
commit c2148cc902
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -4,6 +4,7 @@
* src/rcfile.c (parse_header_exp, parse_magic_exp, grab_and_store): * src/rcfile.c (parse_header_exp, parse_magic_exp, grab_and_store):
Use the now correct parsing of header regexes also for parsing magic Use the now correct parsing of header regexes also for parsing magic
regexes. This fixes Savannah bug #47292 and saves 50 lines of code. regexes. This fixes Savannah bug #47292 and saves 50 lines of code.
* src/rcfile.c (grab_and_store): Rename a variable and densify.
2016-02-26 Benno Schulenberg <bensberg@justemail.net> 2016-02-26 Benno Schulenberg <bensberg@justemail.net>
* doc/man/nanorc.5, doc/texinfo/nano.texi, doc/syntax/nanorc.nanorc, * doc/man/nanorc.5, doc/texinfo/nano.texi, doc/syntax/nanorc.nanorc,

23
src/rcfile.c
View File

@ -876,7 +876,7 @@ void grab_and_store(char *ptr, const char *kind, regexlisttype **storage)
/* Now load the regexes into their part of the struct. */ /* Now load the regexes into their part of the struct. */
while (*ptr != '\0') { while (*ptr != '\0') {
const char *regexstring; const char *regexstring;
regexlisttype *newheader; regexlisttype *newthing;
if (*ptr != '"') { if (*ptr != '"') {
rcfile_error( rcfile_error(
@ -884,28 +884,27 @@ void grab_and_store(char *ptr, const char *kind, regexlisttype **storage)
return; return;
} }
ptr++; regexstring = ++ptr;
regexstring = ptr;
ptr = parse_next_regex(ptr); ptr = parse_next_regex(ptr);
if (ptr == NULL) if (ptr == NULL)
break; return;
newheader = (regexlisttype *)nmalloc(sizeof(regexlisttype)); newthing = (regexlisttype *)nmalloc(sizeof(regexlisttype));
/* Save the regex string if it's valid. */ /* Save the regex string if it's valid. */
if (nregcomp(regexstring, REG_NOSUB)) { if (nregcomp(regexstring, REG_NOSUB)) {
newheader->full_regex = mallocstrcpy(NULL, regexstring); newthing->full_regex = mallocstrcpy(NULL, regexstring);
newheader->rgx = NULL; newthing->rgx = NULL;
if (lastthing == NULL) if (lastthing == NULL)
*storage = newheader; *storage = newthing;
else else
lastthing->next = newheader; lastthing->next = newthing;
lastthing = newheader;
lastthing = newthing;
lastthing->next = NULL; lastthing->next = NULL;
} else } else
free(newheader); free(newthing);
} }
} }