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

tweaks: rename a struct element, to be distinct 

And to match the style of its sisters.
master
Benno Schulenberg 2019-05-31 12:23:47 +02:00
parent 923a90cba0
commit fe40e8867d
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nano.h
View File

@ -233,7 +233,7 @@ typedef struct syntaxtype {
/* The name of this syntax. */ /* The name of this syntax. */
char *filename; char *filename;
/* File where the syntax is defined, or NULL if not an included file. */ /* File where the syntax is defined, or NULL if not an included file. */
struct augmentstruct *extendsyntax; struct augmentstruct *augmentations;
/* List of extendsyntax commands to apply when loaded. */ /* List of extendsyntax commands to apply when loaded. */
regexlisttype *extensions; regexlisttype *extensions;
/* The list of extensions that this syntax applies to. */ /* The list of extensions that this syntax applies to. */

12
src/rcfile.c
View File

@ -326,7 +326,7 @@ void parse_syntax(char *ptr, bool headers_only)
live_syntax = (syntaxtype *)nmalloc(sizeof(syntaxtype)); live_syntax = (syntaxtype *)nmalloc(sizeof(syntaxtype));
live_syntax->name = mallocstrcpy(NULL, nameptr); live_syntax->name = mallocstrcpy(NULL, nameptr);
live_syntax->filename = (headers_only ? strdup(nanorc) : NULL); live_syntax->filename = (headers_only ? strdup(nanorc) : NULL);
live_syntax->extendsyntax = NULL; live_syntax->augmentations = NULL;
live_syntax->extensions = NULL; live_syntax->extensions = NULL;
live_syntax->headers = NULL; live_syntax->headers = NULL;
live_syntax->magics = NULL; live_syntax->magics = NULL;
@ -582,7 +582,7 @@ void parse_one_include(char *file, syntaxtype *syntax)
while (lastcolor->next != NULL) while (lastcolor->next != NULL)
lastcolor = lastcolor->next; lastcolor = lastcolor->next;
augmentstruct *es = syntax->extendsyntax; augmentstruct *es = syntax->augmentations;
/* Apply any stored extendsyntax commands. */ /* Apply any stored extendsyntax commands. */
while (es != NULL) { while (es != NULL) {
@ -604,7 +604,7 @@ void parse_one_include(char *file, syntaxtype *syntax)
free(syntax->filename); free(syntax->filename);
syntax->filename = NULL; syntax->filename = NULL;
syntax->extendsyntax = NULL; syntax->augmentations = NULL;
opensyntax = FALSE; opensyntax = FALSE;
} }
@ -1056,14 +1056,14 @@ void parse_rcfile(FILE *rcstream, bool syntax_only, bool headers_only)
newextendsyntax->data = strdup(ptr); newextendsyntax->data = strdup(ptr);
newextendsyntax->next = NULL; newextendsyntax->next = NULL;
if (sint->extendsyntax != NULL) { if (sint->augmentations != NULL) {
augmentstruct *es = sint->extendsyntax; augmentstruct *es = sint->augmentations;
while (es->next != NULL) while (es->next != NULL)
es = es->next; es = es->next;
es->next = newextendsyntax; es->next = newextendsyntax;
} else } else
sint->extendsyntax = newextendsyntax; sint->augmentations = newextendsyntax;
continue; continue;
} }