Renaming a struct element for aptness and contrast.

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5689 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 045f87250a91b2aa1eccdac190638651c1fe795a..c65439c6c76538ac72f581fa5ff8bdf123551ed7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@
        * src/color.c (found_in_list): Factor out this triple repetition.
        * src/color.c (color_update): Rename a variable for conciseness.
        * src/color.c (nfreeregex): Elide this function, now used just once.
+       * src/nano.h: Rename a struct element for aptness and contrast.
 
 GNU nano 2.5.3 - 2016.02.25
 

diff --git a/src/color.c b/src/color.c
index 542ed76cdfe8849afa13e17ad647e9801a2a9742..f1f6a351d7922cf99709a393e3edf6830f05f230 100644 (file)
--- a/src/color.c
+++ b/src/color.c
@@ -151,7 +151,7 @@ bool found_in_list(regexlisttype *head, const char *shibboleth)
 
        if (not_compiled) {
            item->ext = (regex_t *)nmalloc(sizeof(regex_t));
-           regcomp(item->ext, fixbounds(item->ext_regex), REG_EXTENDED);
+           regcomp(item->ext, fixbounds(item->full_regex), REG_EXTENDED);
        }
 
        if (regexec(item->ext, shibboleth, 0, NULL, 0) == 0)

diff --git a/src/global.c b/src/global.c
index 06cde108e2d13563ff71c283d211892fb3faba91..f31c2e3db00729edf054c3f284995c87005b8181 100644 (file)
--- a/src/global.c
+++ b/src/global.c
@@ -1626,7 +1626,7 @@ int strtomenu(const char *input)
 #ifndef DISABLE_COLOR
 void free_list_item(regexlisttype *dropit)
 {
-    free(dropit->ext_regex);
+    free(dropit->full_regex);
     if (dropit->ext != NULL)
        regfree(dropit->ext);
     free(dropit->ext);

diff --git a/src/nano.h b/src/nano.h
index 0099c37d28ae53f084fca2a3e219c37fd8600314..034cd13b837ae0f43545ee1cd5b4acdea44cf155 100644 (file)
--- a/src/nano.h
+++ b/src/nano.h
@@ -229,8 +229,8 @@ typedef struct colortype {
 } colortype;
 
 typedef struct regexlisttype {
-    char *ext_regex;
-       /* The regexstrings for the things that match this syntax. */
+    char *full_regex;
+       /* A regex string to match things that imply a certain syntax. */
     regex_t *ext;
        /* The compiled regexes. */
     struct regexlisttype *next;

diff --git a/src/rcfile.c b/src/rcfile.c
index db1a129ad8f5c262ec0b20859825aaffe228d686..1b4d19e698cead36b0b3727705b0fb1d16ae3e26 100644 (file)
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -374,7 +374,7 @@ void parse_syntax(char *ptr)
 
        /* Save the extension regex if it's valid. */
        if (nregcomp(fileregptr, REG_NOSUB)) {
-           newext->ext_regex = mallocstrcpy(NULL, fileregptr);
+           newext->full_regex = mallocstrcpy(NULL, fileregptr);
            newext->ext = NULL;
 
            if (endext == NULL)
@@ -895,7 +895,7 @@ void parse_header_exp(char *ptr)
 
        /* Save the regex string if it's valid. */
        if (nregcomp(regexstring, 0)) {
-           newheader->ext_regex = mallocstrcpy(NULL, regexstring);
+           newheader->full_regex = mallocstrcpy(NULL, regexstring);
            newheader->ext = NULL;
 
            if (endheader == NULL)
@@ -960,7 +960,7 @@ void parse_magic_exp(char *ptr)
 
        /* Save the regex string if it's valid. */
        if (nregcomp(regexstring, REG_NOSUB)) {
-           newmagic->ext_regex = mallocstrcpy(NULL, regexstring);
+           newmagic->full_regex = mallocstrcpy(NULL, regexstring);
            newmagic->ext = NULL;
 
            if (endmagic == NULL)