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

[disorder] / lib / trackdb.h

diff --git a/lib/trackdb.h b/lib/trackdb.h
index a37c81b3fd8c478d366529b0624a56bb2b897c73..de2c6771c447538178a23ff59a3a4d973555bd4b 100644 (file)
--- a/lib/trackdb.h
+++ b/lib/trackdb.h
@@ -21,9 +21,8 @@
 #ifndef TRACKDB_H
 #define TRACKDB_H
 
 #ifndef TRACKDB_H
 #define TRACKDB_H
 

-#include <pcre.h>
-

 #include "event.h"
 #include "event.h"

+#include "regexp.h"

 #include "rights.h"
 
 extern const struct cache_type cache_files_type;
 #include "rights.h"
 
 extern const struct cache_type cache_files_type;


@@ -125,7 +124,7 @@ enum trackdb_listable {
 };
 
 char **trackdb_list(const char *dir, int *np, enum trackdb_listable what,
 };
 
 char **trackdb_list(const char *dir, int *np, enum trackdb_listable what,

-                    const pcre *rec);
+                    const regexp *rec);

 /* Return the directories and/or files below DIR.  If DIR is a null pointer
  * then concatenate the listing of all collections.
  *
 /* Return the directories and/or files below DIR.  If DIR is a null pointer
  * then concatenate the listing of all collections.
  *


@@ -159,7 +158,6 @@ const char *trackdb_get_global(const char *name);
 char **trackdb_new(int *ntracksp, int maxtracks);
 
 void trackdb_expire_noticed(time_t when);
 char **trackdb_new(int *ntracksp, int maxtracks);
 
 void trackdb_expire_noticed(time_t when);

-void trackdb_old_users(void);

 void trackdb_create_root(void);
 const char *trackdb_get_password(const char *user);
 int trackdb_adduser(const char *user,
 void trackdb_create_root(void);
 const char *trackdb_get_password(const char *user);
 int trackdb_adduser(const char *user,