Jürgen Hötzel <juergen@hoetzel.info>

* avoid repeated regex compilations (regex for search string do not
 change while scanning the package database)

* remove needless string duplication (regex function do not change target
 string nor free them)

* code cleanup

This patch improves search performance:

bash-3.2$ time ./src/pacman/pacman.static.old -Ss "(database|web).*server" >/dev/null

real    0m1.026s
user    0m0.544s
sys     0m0.208s
bash-3.2$ time ./src/pacman/pacman.static -Ss "(database|web).*server" >/dev/null

real    0m0.777s
user    0m0.456s
sys     0m0.128s
bash-3.2$

1 files changed, 0 insertions, 15 deletions

diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c
index 1610c43f..ec4b7eef 100644
--- a/lib/libalpm/util.c
+++ b/lib/libalpm/util.c
@@ -54,7 +54,6 @@
 #ifndef __sun__
 #include <mntent.h>
 #endif
-#include <regex.h>
 
 /* pacman */
 #include "log.h"
@@ -619,20 +618,6 @@ int _alpm_check_freespace(pmtrans_t *trans, pmlist_t **data)
 }
 #endif
 
-/* match a string against a regular expression */
-int _alpm_reg_match(char *string, char *pattern)
-{
-	int result;
-	regex_t reg;
-
-	if(regcomp(&reg, pattern, REG_EXTENDED | REG_NOSUB | REG_ICASE) != 0) {
-		RET_ERR(PM_ERR_INVALID_REGEX, -1);
-	}
-	result = regexec(&reg, string, 0, 0, 0);
-	regfree(&reg);
-	return(!(result));
-}
-
 /* convert a time_t to a string - buffer MUST be large enough for
  * YYYYMMDDHHMMSS - 15 chars */
 void _alpm_time2string(time_t t, char *buffer)