Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/disorder

[disorder] / lib / trackdb.c

diff --git a/lib/trackdb.c b/lib/trackdb.c
index 7fbdeb5817debecb902306176468d1b4cf6191a1..9e667e2a4ff09c999bcc046aa3b26731fb8bf9e6 100644 (file)
--- a/lib/trackdb.c
+++ b/lib/trackdb.c
@@ -25,7 +25,6 @@
 
 #include <db.h>
 #include <sys/socket.h>
 
 #include <db.h>
 #include <sys/socket.h>

-#include <pcre.h>

 #include <unistd.h>
 #include <errno.h>
 #include <stddef.h>
 #include <unistd.h>
 #include <errno.h>
 #include <stddef.h>


@@ -39,6 +38,7 @@
 
 #include "event.h"
 #include "mem.h"
 
 #include "event.h"
 #include "mem.h"

+#include "regexp.h"

 #include "kvp.h"
 #include "log.h"
 #include "vector.h"
 #include "kvp.h"
 #include "log.h"
 #include "vector.h"


@@ -1182,6 +1182,7 @@ static int compute_alias(char **aliasp,
     }
     return 0;
   default:
     }
     return 0;
   default:

+    *aliasp = 0;

     return err;
   }
 }
     return err;
   }
 }


@@ -1253,7 +1254,7 @@ int trackdb_notice(const char *track,
   for(;;) {
     tid = trackdb_begin_transaction();
     err = trackdb_notice_tid(track, path, tid);
   for(;;) {
     tid = trackdb_begin_transaction();
     err = trackdb_notice_tid(track, path, tid);

-    if((err == DB_LOCK_DEADLOCK)) goto fail;
+    if(err == DB_LOCK_DEADLOCK) goto fail;

     break;
   fail:
     trackdb_abort_transaction(tid);
     break;
   fail:
     trackdb_abort_transaction(tid);


@@ -2238,18 +2239,19 @@ fail:
  * If @p re is NULL then always matches.
  */
 static int track_matches(size_t dl, const char *track, size_t tl,
  * If @p re is NULL then always matches.
  */
 static int track_matches(size_t dl, const char *track, size_t tl,

-                        const pcre *re) {
-  int ovec[3], rc;
+                        const regexp *re) {
+  size_t ovec[3];
+  int rc;

 
   if(!re)
     return 1;
   track += dl + 1;
   tl -= (dl + 1);
 
   if(!re)
     return 1;
   track += dl + 1;
   tl -= (dl + 1);

-  switch(rc = pcre_exec(re, 0, track, tl, 0, 0, ovec, 3)) {
-  case PCRE_ERROR_NOMATCH: return 0;
+  switch(rc = regexp_match(re, track, tl, 0, ovec, 3)) {
+  case RXERR_NOMATCH: return 0;

   default:
     if(rc < 0) {
   default:
     if(rc < 0) {

-      disorder_error(0, "pcre_exec returned %d, subject '%s'", rc, track);
+      disorder_error(0, "regexp_match returned %d, subject '%s'", rc, track);

       return 0;
     }
     return 1;
       return 0;
     }
     return 1;


@@ -2265,7 +2267,7 @@ static int track_matches(size_t dl, const char *track, size_t tl,
  * @return 0 or DB_LOCK_DEADLOCK
  */
 static int do_list(struct vector *v, const char *dir,
  * @return 0 or DB_LOCK_DEADLOCK
  */
 static int do_list(struct vector *v, const char *dir,

-                   enum trackdb_listable what, const pcre *re, DB_TXN *tid) {
+                   enum trackdb_listable what, const regexp *re, DB_TXN *tid) {

   DBC *cursor;
   DBT k, d;
   size_t dl;
   DBC *cursor;
   DBT k, d;
   size_t dl;


@@ -2363,7 +2365,7 @@ deadlocked:
  * @return List of tracks
  */
 char **trackdb_list(const char *dir, int *np, enum trackdb_listable what,
  * @return List of tracks
  */
 char **trackdb_list(const char *dir, int *np, enum trackdb_listable what,

-                    const pcre *re) {
+                    const regexp *re) {

   DB_TXN *tid;
   int n;
   struct vector v;
   DB_TXN *tid;
   int n;
   struct vector v;