From: Mark Wooding Date: Wed, 29 Nov 2017 11:22:48 +0000 (+0000) Subject: Remove ifdeffery for `HAVE_PCRE_H'. X-Git-Tag: 5.2~47 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/c7e016d34b8f0429c0cd9e5366625fdf83776297 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 ' from files which don't actually need it. --- diff --git a/clients/disorder.c b/clients/disorder.c index 7bc2f27..a96a059 100644 --- a/clients/disorder.c +++ b/clients/disorder.c @@ -36,9 +36,7 @@ #if HAVE_UNISTD_H # include #endif -#if HAVE_PCRE_H -# include -#endif +#include #include #if HAVE_GCRYPT_H # include @@ -881,11 +879,9 @@ int main(int argc, char **argv) { mem_init(); network_init(); -#if HAVE_PCRE_H /* 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) { diff --git a/lib/client.c b/lib/client.c index 1967e0e..0fab347 100644 --- a/lib/client.c +++ b/lib/client.c @@ -41,9 +41,6 @@ #if HAVE_NETDB_H # include #endif -#if HAVE_PCRE_H -# include -#endif #include "log.h" #include "mem.h" diff --git a/lib/configuration.c b/lib/configuration.c index c2f0791..83423c7 100644 --- a/lib/configuration.c +++ b/lib/configuration.c @@ -36,9 +36,7 @@ #if HAVE_LANGINFO_H # include #endif -#if HAVE_PCRE_H -# include -#endif +#include #if HAVE_SHLOBJ_H # include #endif @@ -55,9 +53,7 @@ #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" @@ -401,7 +397,6 @@ static int set_sample_format(const struct config_state *cs, nvec, vec); } -#if HAVE_PCRE_H 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; } -#endif 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); } -#if HAVE_PCRE_H 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); } -#endif 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 }, -#if HAVE_PCRE_H 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 }; @@ -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 }, -#if HAVE_PCRE_H { 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 }, @@ -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 }, -#if HAVE_PCRE_H { C(transform), &type_transform, validate_any }, -#endif { 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; -#if HAVE_PCRE_H 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" }, @@ -1472,12 +1455,10 @@ static void config_postdefaults(struct config *c, { "dir", "[[:punct:]]", "", "sort", "g", } }; #define NTRANSFORM (int)(sizeof transform / sizeof *transform) -#endif cs.path = ""; cs.line = 0; cs.config = c; -#if HAVE_PCRE_H 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]); } -#endif 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 */ } -#if HAVE_PCRE_H 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; @@ -1702,7 +1680,6 @@ static int stringlist_compare(const struct stringlist *a, return 0; } -#if HAVE_PCRE_H /** @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; } -#endif /** @brief Verify configuration table. * @return The number of problems found diff --git a/lib/configuration.h b/lib/configuration.h index c2a39aa..f5b2061 100644 --- a/lib/configuration.h +++ b/lib/configuration.h @@ -22,9 +22,7 @@ #ifndef CONFIGURATION_H #define CONFIGURATION_H -#if HAVE_PCRE_H -# include -#endif +#include #include "speaker-protocol.h" #include "rights.h" @@ -70,7 +68,6 @@ struct collectionlist { struct collection *s; }; -#if HAVE_PCRE_H /** @brief A track name part */ struct namepart { char *part; /* part */ @@ -101,7 +98,6 @@ struct transformlist { int n; struct transform *t; }; -#endif /** @brief System configuration */ struct config { @@ -220,9 +216,7 @@ struct config { /** @brief Minimum time between a track being played again */ long replay_min; -#if HAVE_PCRE_H struct namepartlist namepart; /* transformations */ -#endif /** @brief Termination signal for subprocesses */ int signal; @@ -230,9 +224,7 @@ struct config { /** @brief ALSA output device */ const char *device; -#if HAVE_PCRE_H struct transformlist transform; /* path name transformations */ -#endif /** @brief Address to send audio data to */ struct netaddress broadcast; diff --git a/lib/cookies.c b/lib/cookies.c index 0efe8d0..c216d86 100644 --- a/lib/cookies.c +++ b/lib/cookies.c @@ -24,7 +24,6 @@ #include #include #include -#include #include "cookies.h" #include "hash.h" diff --git a/lib/trackdb-stub.c b/lib/trackdb-stub.c index 5f6860e..e54b990 100644 --- a/lib/trackdb-stub.c +++ b/lib/trackdb-stub.c @@ -23,8 +23,6 @@ #include "common.h" -#include - #include "rights.h" #include "trackdb.h" diff --git a/lib/trackname.c b/lib/trackname.c index aa11e2e..644d069 100644 --- a/lib/trackname.c +++ b/lib/trackname.c @@ -19,8 +19,6 @@ * @brief Track name calculation */ #include "common.h" - -#include #include #include "trackname.h" diff --git a/lib/trackorder.c b/lib/trackorder.c index 94d2bd5..454c2ed 100644 --- a/lib/trackorder.c +++ b/lib/trackorder.c @@ -20,7 +20,6 @@ */ #include "common.h" -#include #include #include "trackname.h" diff --git a/server/disorder-server.h b/server/disorder-server.h index 2256272..78b8cfa 100644 --- a/server/disorder-server.h +++ b/server/disorder-server.h @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include