Deleting a now-unused struct member.

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

diff --git a/ChangeLog b/ChangeLog
index 85d56b28da7b9dbeeddb2a1090f812fa9d2dd267..6d44519fe3d46c5a69e1852de8aae6cc41b61d80 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
        * src/color.c (found_in_list): Don't bother keeping the compiled
        regular expression when it matched -- drop this tiny optimization
        for when opening multiple files.  Instead stop calling malloc().
+       * src/nano.h: Delete a now-unused struct member.
 
 2016-03-01  Benno Schulenberg  <bensberg@justemail.net>
        * src/rcfile.c (parse_syntax), src/color.c (color_update): Don't

diff --git a/src/global.c b/src/global.c
index 7238921321f98c9471bf0cfcc3e9ed87cf18e73c..35c91ad69cfac99ccd6cc94932140fbce2170f7f 100644 (file)
--- a/src/global.c
+++ b/src/global.c
@@ -1627,9 +1627,6 @@ int strtomenu(const char *input)
 void free_list_item(regexlisttype *dropit)
 {
     free(dropit->full_regex);
-    if (dropit->rgx != NULL)
-       regfree(dropit->rgx);
-    free(dropit->rgx);
     free(dropit);
 }
 #endif

diff --git a/src/nano.h b/src/nano.h
index a2f6ee6dcd08c76e16cbc299d6d304896fcf2dec..990cc238193d159edee51cf92ad16895bf013d39 100644 (file)
--- a/src/nano.h
+++ b/src/nano.h
@@ -231,8 +231,6 @@ typedef struct colortype {
 typedef struct regexlisttype {
     char *full_regex;
        /* A regex string to match things that imply a certain syntax. */
-    regex_t *rgx;
-       /* The compiled regex. */
     struct regexlisttype *next;
        /* The next regex. */
 } regexlisttype;

diff --git a/src/rcfile.c b/src/rcfile.c
index 342fecffe22bc0f027a3caf5b50df525bf5b163c..8e1a62d568c6881d7ede80fb5a9d2602477d13db 100644 (file)
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -353,7 +353,6 @@ void parse_syntax(char *ptr)
        /* Save the extension regex if it's valid. */
        if (nregcomp(fileregptr, REG_NOSUB)) {
            newext->full_regex = mallocstrcpy(NULL, fileregptr);
-           newext->rgx = NULL;
 
            if (endext == NULL)
                endsyntax->extensions = newext;
@@ -880,7 +879,6 @@ void grab_and_store(char *ptr, const char *kind, regexlisttype **storage)
        /* Copy the regex into a struct, and hook this in at the end. */
        newthing = (regexlisttype *)nmalloc(sizeof(regexlisttype));
        newthing->full_regex = mallocstrcpy(NULL, regexstring);
-       newthing->rgx = NULL;
        newthing->next = NULL;
 
        if (lastthing == NULL)