Concentrate knowledge about the `pcre' API in one place.

[disorder] / lib / configuration.h

diff --git a/lib/configuration.h b/lib/configuration.h
index f5b206127944f5bba325810052b84916e5d72665..148d08f60adda079a105ab00a797d39f34ce2a6c 100644 (file)
--- a/lib/configuration.h
+++ b/lib/configuration.h
@@ -22,9 +22,8 @@
 #ifndef CONFIGURATION_H
 #define CONFIGURATION_H
 
 #ifndef CONFIGURATION_H
 #define CONFIGURATION_H
 

-#include <pcre.h>
-

 #include "speaker-protocol.h"
 #include "speaker-protocol.h"

+#include "regexp.h"

 #include "rights.h"
 #include "addr.h"
 
 #include "rights.h"
 #include "addr.h"
 


@@ -71,7 +70,7 @@ struct collectionlist {
 /** @brief A track name part */
 struct namepart {
   char *part;                          /* part */
 /** @brief A track name part */
 struct namepart {
   char *part;                          /* part */

-  pcre *re;                            /* compiled regexp */
+  regexp *re;                          /* compiled regexp */

   char *res;                            /* regexp as a string */
   char *replace;                       /* replacement string */
   char *context;                       /* context glob */
   char *res;                            /* regexp as a string */
   char *replace;                       /* replacement string */
   char *context;                       /* context glob */


@@ -89,7 +88,7 @@ struct transform {
   char *type;                          /* track or dir */
   char *context;                       /* sort or choose */
   char *replace;                       /* substitution string */
   char *type;                          /* track or dir */
   char *context;                       /* sort or choose */
   char *replace;                       /* substitution string */

-  pcre *re;                            /* compiled re */
+  regexp *re;                          /* compiled re */

   unsigned flags;                      /* regexp flags */
 };
 
   unsigned flags;                      /* regexp flags */
 };