Remove ifdeffery for `HAVE_PCRE_H'.

This isn't actually an optional extra: the build simply won't work
without it, so the ifdeffery is just unnecessary complication.  Remove
it all.

Also, remove `#include <pcre.h>' from files which don't actually need
it.

diff --git a/clients/disorder.c b/clients/disorder.c
index 7bc2f27f838542bced4f627f0da763ae5e702f02..a96a0592fc68a304858a358047154737d01e2be6 100644 (file)
--- a/clients/disorder.c
+++ b/clients/disorder.c
@@ -36,9 +36,7 @@
 #if HAVE_UNISTD_H
 # include <unistd.h>
 #endif
 #if HAVE_UNISTD_H
 # include <unistd.h>
 #endif

-#if HAVE_PCRE_H
-# include <pcre.h>
-#endif
+#include <pcre.h>

 #include <ctype.h>
 #if HAVE_GCRYPT_H
 # include <gcrypt.h>
 #include <ctype.h>
 #if HAVE_GCRYPT_H
 # include <gcrypt.h>


@@ -881,11 +879,9 @@ int main(int argc, char **argv) {
 
   mem_init();
   network_init();
 
   mem_init();
   network_init();

-#if HAVE_PCRE_H

   /* garbage-collect PCRE's memory */
   pcre_malloc = xmalloc;
   pcre_free = xfree;
   /* garbage-collect PCRE's memory */
   pcre_malloc = xmalloc;
   pcre_free = xfree;

-#endif

   if(!setlocale(LC_CTYPE, "")) disorder_fatal(errno, "error calling setlocale");
   if(!setlocale(LC_TIME, "")) disorder_fatal(errno, "error calling setlocale");
   while((n = getopt_long(argc, argv, "+hVc:dHlNu:p:", options, 0)) >= 0) {
   if(!setlocale(LC_CTYPE, "")) disorder_fatal(errno, "error calling setlocale");
   if(!setlocale(LC_TIME, "")) disorder_fatal(errno, "error calling setlocale");
   while((n = getopt_long(argc, argv, "+hVc:dHlNu:p:", options, 0)) >= 0) {

diff --git a/lib/client.c b/lib/client.c
index 1967e0eea90a813225fd8570611c6088f242f771..0fab347818ac37fadfad6eec55f575190f2b2025 100644 (file)
--- a/lib/client.c
+++ b/lib/client.c
@@ -41,9 +41,6 @@
 #if HAVE_NETDB_H
 # include <netdb.h>
 #endif
 #if HAVE_NETDB_H
 # include <netdb.h>
 #endif

-#if HAVE_PCRE_H
-# include <pcre.h>
-#endif

 
 #include "log.h"
 #include "mem.h"
 
 #include "log.h"
 #include "mem.h"

diff --git a/lib/configuration.c b/lib/configuration.c
index c2f0791c9c9ae47c1f3615daabad70664be20b6f..83423c7dde19f035eb8f8ed12d11b5b374e05af0 100644 (file)
--- a/lib/configuration.c
+++ b/lib/configuration.c
@@ -36,9 +36,7 @@
 #if HAVE_LANGINFO_H
 # include <langinfo.h>
 #endif
 #if HAVE_LANGINFO_H
 # include <langinfo.h>
 #endif

-#if HAVE_PCRE_H
-# include <pcre.h>
-#endif
+#include <pcre.h>

 #if HAVE_SHLOBJ_H
 # include <Shlobj.h>
 #endif
 #if HAVE_SHLOBJ_H
 # include <Shlobj.h>
 #endif


@@ -55,9 +53,7 @@
 #include "charset.h"
 #include "defs.h"
 #include "printf.h"
 #include "charset.h"
 #include "defs.h"
 #include "printf.h"

-#if HAVE_PCRE_H
-# include "regsub.h"
-#endif
+#include "regsub.h"

 #include "signame.h"
 #include "authhash.h"
 #include "vector.h"
 #include "signame.h"
 #include "authhash.h"
 #include "vector.h"


@@ -401,7 +397,6 @@ static int set_sample_format(const struct config_state *cs,
                             nvec, vec);
 }
 
                             nvec, vec);
 }
 

-#if HAVE_PCRE_H

 static int set_namepart(const struct config_state *cs,
                        const struct conf *whoami,
                        int nvec, char **vec) {
 static int set_namepart(const struct config_state *cs,
                        const struct conf *whoami,
                        int nvec, char **vec) {


@@ -487,7 +482,6 @@ static int set_transform(const struct config_state *cs,
   ++tl->n;
   return 0;
 }
   ++tl->n;
   return 0;
 }

-#endif

 
 static int set_rights(const struct config_state *cs,
                      const struct conf *whoami,
 
 static int set_rights(const struct config_state *cs,
                      const struct conf *whoami,


@@ -569,7 +563,6 @@ static void free_collectionlist(struct config *c,
   xfree(cll->s);
 }
 
   xfree(cll->s);
 }
 

-#if HAVE_PCRE_H

 static void free_namepartlist(struct config *c,
                              const struct conf *whoami) {
   struct namepartlist *npl = ADDRESS(c, struct namepartlist);
 static void free_namepartlist(struct config *c,
                              const struct conf *whoami) {
   struct namepartlist *npl = ADDRESS(c, struct namepartlist);


@@ -602,7 +595,6 @@ static void free_transformlist(struct config *c,
   }
   xfree(tl->t);
 }
   }
   xfree(tl->t);
 }

-#endif

 
 static void free_netaddress(struct config *c,
                            const struct conf *whoami) {
 
 static void free_netaddress(struct config *c,
                            const struct conf *whoami) {


@@ -622,10 +614,8 @@ static const struct conftype
   type_stringlist_accum = { set_stringlist_accum, free_stringlistlist },
   type_string_accum = { set_string_accum, free_stringlist },
   type_sample_format = { set_sample_format, free_none },
   type_stringlist_accum = { set_stringlist_accum, free_stringlistlist },
   type_string_accum = { set_string_accum, free_stringlist },
   type_sample_format = { set_sample_format, free_none },

-#if HAVE_PCRE_H

   type_namepart = { set_namepart, free_namepartlist },
   type_transform = { set_transform, free_transformlist },
   type_namepart = { set_namepart, free_namepartlist },
   type_transform = { set_transform, free_transformlist },

-#endif

   type_netaddress = { set_netaddress, free_netaddress },
   type_rights = { set_rights, free_string };
 
   type_netaddress = { set_netaddress, free_netaddress },
   type_rights = { set_rights, free_string };
 


@@ -1056,9 +1046,7 @@ static const struct conf conf[] = {
   { C(mount_rescan),     &type_boolean,          validate_any },
   { C(multicast_loop),   &type_boolean,          validate_any },
   { C(multicast_ttl),    &type_integer,          validate_non_negative },
   { C(mount_rescan),     &type_boolean,          validate_any },
   { C(multicast_loop),   &type_boolean,          validate_any },
   { C(multicast_ttl),    &type_integer,          validate_non_negative },

-#if HAVE_PCRE_H

   { C(namepart),         &type_namepart,         validate_any },
   { C(namepart),         &type_namepart,         validate_any },

-#endif

   { C(new_bias),         &type_integer,          validate_positive },
   { C(new_bias_age),     &type_integer,          validate_positive },
   { C(new_max),          &type_integer,          validate_positive },
   { C(new_bias),         &type_integer,          validate_positive },
   { C(new_bias_age),     &type_integer,          validate_positive },
   { C(new_max),          &type_integer,          validate_positive },


@@ -1098,9 +1086,7 @@ static const struct conf conf[] = {
   { C(stopword),         &type_string_accum,     validate_any },
   { C(templates),        &type_string_accum,     validate_isdir },
   { C(tracklength),      &type_stringlist_accum, validate_tracklength },
   { C(stopword),         &type_string_accum,     validate_any },
   { C(templates),        &type_string_accum,     validate_isdir },
   { C(tracklength),      &type_stringlist_accum, validate_tracklength },

-#if HAVE_PCRE_H

   { C(transform),        &type_transform,        validate_any },
   { C(transform),        &type_transform,        validate_any },

-#endif

   { C(url),              &type_string,           validate_url },
 #if !_WIN32
   { C(user),             &type_string,           validate_isauser },
   { C(url),              &type_string,           validate_url },
 #if !_WIN32
   { C(user),             &type_string,           validate_isauser },


@@ -1449,12 +1435,9 @@ void config_free(struct config *c) {
 static void config_postdefaults(struct config *c,
                                int server) {
   struct config_state cs;
 static void config_postdefaults(struct config *c,
                                int server) {
   struct config_state cs;

-#if HAVE_PCRE_H

   const struct conf *whoami;
   int n;
   const struct conf *whoami;
   int n;

-#endif

 
 

-#if HAVE_PCRE_H

   static const char *namepart[][4] = {
     { "title",  "/([0-9]+ *[-:]? *)?([^/]+)\\.[a-zA-Z0-9]+$", "$2", "display" },
     { "title",  "/([^/]+)\\.[a-zA-Z0-9]+$",           "$1", "sort" },
   static const char *namepart[][4] = {
     { "title",  "/([0-9]+ *[-:]? *)?([^/]+)\\.[a-zA-Z0-9]+$", "$2", "display" },
     { "title",  "/([^/]+)\\.[a-zA-Z0-9]+$",           "$1", "sort" },


@@ -1472,12 +1455,10 @@ static void config_postdefaults(struct config *c,
     { "dir",   "[[:punct:]]",                           "", "sort", "g", }
   };
 #define NTRANSFORM (int)(sizeof transform / sizeof *transform)
     { "dir",   "[[:punct:]]",                           "", "sort", "g", }
   };
 #define NTRANSFORM (int)(sizeof transform / sizeof *transform)

-#endif

 
   cs.path = "<internal>";
   cs.line = 0;
   cs.config = c;
 
   cs.path = "<internal>";
   cs.line = 0;
   cs.config = c;

-#if HAVE_PCRE_H

   if(!c->namepart.n) {
     whoami = find("namepart");
     for(n = 0; n < NNAMEPART; ++n)
   if(!c->namepart.n) {
     whoami = find("namepart");
     for(n = 0; n < NNAMEPART; ++n)


@@ -1488,7 +1469,6 @@ static void config_postdefaults(struct config *c,
     for(n = 0; n < NTRANSFORM; ++n)
       set_transform(&cs, whoami, 5, (char **)transform[n]);
   }
     for(n = 0; n < NTRANSFORM; ++n)
       set_transform(&cs, whoami, 5, (char **)transform[n]);
   }

-#endif

   if(!c->api) {
     if(c->speaker_command)
       c->api = xstrdup("command");
   if(!c->api) {
     if(c->speaker_command)
       c->api = xstrdup("command");


@@ -1604,12 +1584,10 @@ int config_read(int server,
       disorder_error(0, "'nice_server' cannot be changed without a restart");
       /* ...but we accept the new config anyway */
     }
       disorder_error(0, "'nice_server' cannot be changed without a restart");
       /* ...but we accept the new config anyway */
     }

-#if HAVE_PCRE_H

     if(namepartlist_compare(&c->namepart, &oldconfig->namepart)) {
       disorder_error(0, "'namepart' settings cannot be changed without a restart");
       failed = 1;
     }
     if(namepartlist_compare(&c->namepart, &oldconfig->namepart)) {
       disorder_error(0, "'namepart' settings cannot be changed without a restart");
       failed = 1;
     }

-#endif

     if(stringlist_compare(&c->stopword, &oldconfig->stopword)) {
       disorder_error(0, "'stopword' settings cannot be changed without a restart");
       failed = 1;
     if(stringlist_compare(&c->stopword, &oldconfig->stopword)) {
       disorder_error(0, "'stopword' settings cannot be changed without a restart");
       failed = 1;


@@ -1702,7 +1680,6 @@ static int stringlist_compare(const struct stringlist *a,
     return 0;
 }
 
     return 0;
 }
 

-#if HAVE_PCRE_H

 /** @brief Order two namepart definitions
  * @param a First namepart definition
  * @param b Second namepart definition
 /** @brief Order two namepart definitions
  * @param a First namepart definition
  * @param b Second namepart definition


@@ -1748,7 +1725,6 @@ static int namepartlist_compare(const struct namepartlist *a,
   else
     return 0;
 }
   else
     return 0;
 }

-#endif

 
 /** @brief Verify configuration table.
  * @return The number of problems found
 
 /** @brief Verify configuration table.
  * @return The number of problems found

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

-#if HAVE_PCRE_H
-# include <pcre.h>
-#endif
+#include <pcre.h>

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


@@ -70,7 +68,6 @@ struct collectionlist {
   struct collection *s;
 };
 
   struct collection *s;
 };
 

-#if HAVE_PCRE_H

 /** @brief A track name part */
 struct namepart {
   char *part;                          /* part */
 /** @brief A track name part */
 struct namepart {
   char *part;                          /* part */


@@ -101,7 +98,6 @@ struct transformlist {
   int n;
   struct transform *t;
 };
   int n;
   struct transform *t;
 };

-#endif

 
 /** @brief System configuration */
 struct config {
 
 /** @brief System configuration */
 struct config {


@@ -220,9 +216,7 @@ struct config {
   /** @brief Minimum time between a track being played again */
   long replay_min;
   
   /** @brief Minimum time between a track being played again */
   long replay_min;
   

-#if HAVE_PCRE_H

   struct namepartlist namepart;                /* transformations */
   struct namepartlist namepart;                /* transformations */

-#endif

 
   /** @brief Termination signal for subprocesses */
   int signal;
 
   /** @brief Termination signal for subprocesses */
   int signal;


@@ -230,9 +224,7 @@ struct config {
   /** @brief ALSA output device */
   const char *device;
 
   /** @brief ALSA output device */
   const char *device;
 

-#if HAVE_PCRE_H

   struct transformlist transform;      /* path name transformations */
   struct transformlist transform;      /* path name transformations */

-#endif

 
   /** @brief Address to send audio data to */
   struct netaddress broadcast;
 
   /** @brief Address to send audio data to */
   struct netaddress broadcast;

diff --git a/lib/cookies.c b/lib/cookies.c
index 0efe8d0ecf1bf44395350c4bc1732409565a53a3..c216d86e0728f08e1d67eeb2f465abf723ed0eeb 100644 (file)
--- a/lib/cookies.c
+++ b/lib/cookies.c
@@ -24,7 +24,6 @@
 #include <errno.h>
 #include <time.h>
 #include <gcrypt.h>
 #include <errno.h>
 #include <time.h>
 #include <gcrypt.h>

-#include <pcre.h>

 
 #include "cookies.h"
 #include "hash.h"
 
 #include "cookies.h"
 #include "hash.h"

diff --git a/lib/trackdb-stub.c b/lib/trackdb-stub.c
index 5f6860e534a270f80374964bdd9dc9d80c238bd1..e54b990d52182d75b19f80624802b9a76c2aeed9 100644 (file)
--- a/lib/trackdb-stub.c
+++ b/lib/trackdb-stub.c
@@ -23,8 +23,6 @@
 
 #include "common.h"
 
 
 #include "common.h"
 

-#include <pcre.h>
-

 #include "rights.h"
 #include "trackdb.h"
 
 #include "rights.h"
 #include "trackdb.h"
 

diff --git a/lib/trackname.c b/lib/trackname.c
index aa11e2e819286fc38ec8ea84b354e44e47180918..644d06926ba30aff440371767874755ff8fc947b 100644 (file)
--- a/lib/trackname.c
+++ b/lib/trackname.c
@@ -19,8 +19,6 @@
  * @brief Track name calculation
  */
 #include "common.h"
  * @brief Track name calculation
  */
 #include "common.h"

-
-#include <pcre.h>

 #include <fnmatch.h>
 
 #include "trackname.h"
 #include <fnmatch.h>
 
 #include "trackname.h"

diff --git a/lib/trackorder.c b/lib/trackorder.c
index 94d2bd5e9cde7dece533e64728a8cc83c5f8fbad..454c2ed9534c09a923c758e7f17bad8da9665367 100644 (file)
--- a/lib/trackorder.c
+++ b/lib/trackorder.c
@@ -20,7 +20,6 @@
  */
 #include "common.h"
 
  */
 #include "common.h"
 

-#include <pcre.h>

 #include <fnmatch.h>
 
 #include "trackname.h"
 #include <fnmatch.h>
 
 #include "trackname.h"

diff --git a/server/disorder-server.h b/server/disorder-server.h
index 22562728a37cd1132085f4c4463de4793f0a3723..78b8cfa4766f282fa6bb5729c3e73009f6533da9 100644 (file)
--- a/server/disorder-server.h
+++ b/server/disorder-server.h
@@ -33,7 +33,6 @@
 #include <grp.h>
 #include <locale.h>
 #include <netinet/in.h>
 #include <grp.h>
 #include <locale.h>
 #include <netinet/in.h>

-#include <pcre.h>

 #include <pwd.h>
 #include <signal.h>
 #include <stddef.h>
 #include <pwd.h>
 #include <signal.h>
 #include <stddef.h>