bug-grep
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 2/9] grep: remove one #ifdef


From: Paolo Bonzini
Subject: [PATCH 2/9] grep: remove one #ifdef
Date: Fri, 19 Mar 2010 12:36:45 +0100

* search.c (Ecompile): Always go through GEAcompile.
---
 src/search.c |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/src/search.c b/src/search.c
index c986d48..1d3868a 100644
--- a/src/search.c
+++ b/src/search.c
@@ -257,16 +257,10 @@ is_mb_middle(const char **good, const char *buf, const 
char *end)
 #endif /* MBS_SUPPORT */
 
 #if defined(GREP_PROGRAM) || defined(EGREP_PROGRAM)
-#ifdef EGREP_PROGRAM
-COMPILE_FCT(Ecompile)
-{
-  reg_syntax_t syntax_bits = RE_SYNTAX_POSIX_EGREP;
-#else
 /* No __VA_ARGS__ in C89.  So we have to do it this way.  */
 static COMPILE_RET
 GEAcompile (char const *pattern, size_t size, reg_syntax_t syntax_bits)
 {
-#endif /* EGREP_PROGRAM */
   const char *err;
   const char *p, *sep;
   size_t total = size;
@@ -365,12 +359,12 @@ COMPILE_FCT(Acompile)
 {
   return GEAcompile (pattern, size, RE_SYNTAX_AWK);
 }
+#endif /* !EGREP_PROGRAM */
 
 COMPILE_FCT(Ecompile)
 {
   return GEAcompile (pattern, size, RE_SYNTAX_POSIX_EGREP);
 }
-#endif /* !EGREP_PROGRAM */
 
 EXECUTE_FCT(EGexecute)
 {
-- 
1.6.6.1






reply via email to

[Prev in Thread] Current Thread [Next in Thread]