@matheusbsbs / matheus-bagliano / commits / b48fb5b6a9
Fork 0

grep: free expressions and patterns when done.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Sep 27, 2006 at 16:27 UTC b48fb5b6a950a6757b790e9160967065a3e03978
3 files changed +45
builtin-grep.c
+2
@@ -325,6 +325,7 @@ static int grep_cache(struct grep_opt *opt, const char **paths, int cached)
325 else
326 hit |= grep_file(opt, ce->name);
327 }
328 + free_grep_patterns(opt);
329 return hit;
330 }
331
@@ -694,5 +695,6 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
695 if (grep_object(&opt, paths, real_obj, list.objects[i].name))
696 hit = 1;
697 }
698 + free_grep_patterns(&opt);
699 return !hit;
700 }
grep.c
+42
@@ -167,6 +167,46 @@ void compile_grep_patterns(struct grep_opt *opt)
167 die("incomplete pattern expression: %s", p->pattern);
168 }
169
170 +static void free_pattern_expr(struct grep_expr *x)
171 +{
172 + switch (x->node) {
173 + case GREP_NODE_ATOM:
174 + break;
175 + case GREP_NODE_NOT:
176 + free_pattern_expr(x->u.unary);
177 + break;
178 + case GREP_NODE_AND:
179 + case GREP_NODE_OR:
180 + free_pattern_expr(x->u.binary.left);
181 + free_pattern_expr(x->u.binary.right);
182 + break;
183 + }
184 + free(x);
185 +}
186 +
187 +void free_grep_patterns(struct grep_opt *opt)
188 +{
189 + struct grep_pat *p, *n;
190 +
191 + for (p = opt->pattern_list; p; p = n) {
192 + n = p->next;
193 + switch (p->token) {
194 + case GREP_PATTERN: /* atom */
195 + case GREP_PATTERN_HEAD:
196 + case GREP_PATTERN_BODY:
197 + regfree(&p->regexp);
198 + break;
199 + default:
200 + break;
201 + }
202 + free(p);
203 + }
204 +
205 + if (!opt->extended)
206 + return;
207 + free_pattern_expr(opt->pattern_expression);
208 +}
209 +
210 static char *end_of_line(char *cp, unsigned long *left)
211 {
212 unsigned long l = *left;
@@ -439,6 +479,8 @@ int grep_buffer(struct grep_opt *opt, const char *name, char *buf, unsigned long
479 lno++;
480 }
481
482 + free(prev);
483 +
484 if (opt->status_only)
485 return 0;
486 if (opt->unmatch_name_only) {
grep.h
+1
@@ -73,6 +73,7 @@ struct grep_opt {
73
74 extern void append_grep_pattern(struct grep_opt *opt, const char *pat, const char *origin, int no, enum grep_pat_token t);
75 extern void compile_grep_patterns(struct grep_opt *opt);
76 +extern void free_grep_patterns(struct grep_opt *opt);
77 extern int grep_buffer(struct grep_opt *opt, const char *name, char *buf, unsigned long size);
78
79 #endif