From c02c182bd776c1b2f83440981525fe0f0cfed81a Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Fri, 4 Mar 2016 17:04:56 +0000 Subject: [PATCH] Deleting a now-unused struct member. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5707 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 1 + src/global.c | 3 --- src/nano.h | 2 -- src/rcfile.c | 2 -- 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 85d56b28..6d44519f 100644 --- 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 * src/rcfile.c (parse_syntax), src/color.c (color_update): Don't diff --git a/src/global.c b/src/global.c index 72389213..35c91ad6 100644 --- 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 a2f6ee6d..990cc238 100644 --- 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 342fecff..8e1a62d5 100644 --- 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) -- 2.39.5