From 6a605cd6bd9f689b35676623add0de9b90978bf1 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Thu, 10 Jul 2014 14:02:08 -0400 Subject: [PATCH] Adjust blank lines around PG_MODULE_MAGIC defines, for consistency Report by Robert Haas --- contrib/dict_int/dict_int.c | 1 - contrib/earthdistance/earthdistance.c | 1 - contrib/intarray/_int_op.c | 1 - contrib/lo/lo.c | 1 - contrib/passwordcheck/passwordcheck.c | 1 - contrib/pg_buffercache/pg_buffercache_pages.c | 1 - contrib/pg_freespacemap/pg_freespacemap.c | 1 - contrib/pg_stat_statements/pg_stat_statements.c | 1 - contrib/pg_trgm/trgm_op.c | 1 - contrib/pgrowlocks/pgrowlocks.c | 1 - contrib/pgstattuple/pgstattuple.c | 1 - contrib/postgres_fdw/postgres_fdw.c | 1 - contrib/sslinfo/sslinfo.c | 2 -- contrib/tcn/tcn.c | 2 -- contrib/test_decoding/test_decoding.c | 1 - contrib/test_parser/test_parser.c | 1 - contrib/test_shm_mq/test.c | 4 +++- contrib/uuid-ossp/uuid-ossp.c | 2 -- contrib/xml2/xpath.c | 1 - src/backend/snowball/dict_snowball.c | 1 - src/pl/plperl/plperl.c | 1 - src/tutorial/complex.c | 1 - src/tutorial/funcs.c | 1 - src/tutorial/funcs_new.c | 1 - 24 files changed, 3 insertions(+), 27 deletions(-) diff --git a/contrib/dict_int/dict_int.c b/contrib/dict_int/dict_int.c index 79067a86f0..be24aa7b22 100644 --- a/contrib/dict_int/dict_int.c +++ b/contrib/dict_int/dict_int.c @@ -17,7 +17,6 @@ PG_MODULE_MAGIC; - typedef struct { int maxlen; diff --git a/contrib/earthdistance/earthdistance.c b/contrib/earthdistance/earthdistance.c index 6bbebdfd1a..861b166373 100644 --- a/contrib/earthdistance/earthdistance.c +++ b/contrib/earthdistance/earthdistance.c @@ -10,7 +10,6 @@ #define M_PI 3.14159265358979323846 #endif - PG_MODULE_MAGIC; /* Earth's radius is in statute miles. */ diff --git a/contrib/intarray/_int_op.c b/contrib/intarray/_int_op.c index 70849be57f..537174175b 100644 --- a/contrib/intarray/_int_op.c +++ b/contrib/intarray/_int_op.c @@ -6,7 +6,6 @@ #include "_int.h" - PG_MODULE_MAGIC; PG_FUNCTION_INFO_V1(_int_different); diff --git a/contrib/lo/lo.c b/contrib/lo/lo.c index 4dee64724d..953659305f 100644 --- a/contrib/lo/lo.c +++ b/contrib/lo/lo.c @@ -12,7 +12,6 @@ #include "libpq/be-fsstubs.h" #include "utils/rel.h" - PG_MODULE_MAGIC; #define atooid(x) ((Oid) strtoul((x), NULL, 10)) diff --git a/contrib/passwordcheck/passwordcheck.c b/contrib/passwordcheck/passwordcheck.c index 405896d40a..e4ad3a3892 100644 --- a/contrib/passwordcheck/passwordcheck.c +++ b/contrib/passwordcheck/passwordcheck.c @@ -24,7 +24,6 @@ #include "fmgr.h" #include "libpq/md5.h" - PG_MODULE_MAGIC; /* passwords shorter than this will be rejected */ diff --git a/contrib/pg_buffercache/pg_buffercache_pages.c b/contrib/pg_buffercache/pg_buffercache_pages.c index f39fe255db..b205683bff 100644 --- a/contrib/pg_buffercache/pg_buffercache_pages.c +++ b/contrib/pg_buffercache/pg_buffercache_pages.c @@ -19,7 +19,6 @@ PG_MODULE_MAGIC; - /* * Record structure holding the to be exposed cache data. */ diff --git a/contrib/pg_freespacemap/pg_freespacemap.c b/contrib/pg_freespacemap/pg_freespacemap.c index 7805345add..7d939a7d20 100644 --- a/contrib/pg_freespacemap/pg_freespacemap.c +++ b/contrib/pg_freespacemap/pg_freespacemap.c @@ -11,7 +11,6 @@ #include "funcapi.h" #include "storage/freespace.h" - PG_MODULE_MAGIC; /* diff --git a/contrib/pg_stat_statements/pg_stat_statements.c b/contrib/pg_stat_statements/pg_stat_statements.c index 7c2216a7ee..6beced0e7d 100644 --- a/contrib/pg_stat_statements/pg_stat_statements.c +++ b/contrib/pg_stat_statements/pg_stat_statements.c @@ -76,7 +76,6 @@ #include "utils/builtins.h" #include "utils/memutils.h" - PG_MODULE_MAGIC; /* Location of permanent stats file (valid when database is shut down) */ diff --git a/contrib/pg_trgm/trgm_op.c b/contrib/pg_trgm/trgm_op.c index c385e09edd..df15b52b4a 100644 --- a/contrib/pg_trgm/trgm_op.c +++ b/contrib/pg_trgm/trgm_op.c @@ -11,7 +11,6 @@ #include "tsearch/ts_locale.h" #include "utils/memutils.h" - PG_MODULE_MAGIC; float4 trgm_limit = 0.3f; diff --git a/contrib/pgrowlocks/pgrowlocks.c b/contrib/pgrowlocks/pgrowlocks.c index 15d9704752..7b8c9fbb32 100644 --- a/contrib/pgrowlocks/pgrowlocks.c +++ b/contrib/pgrowlocks/pgrowlocks.c @@ -38,7 +38,6 @@ #include "utils/snapmgr.h" #include "utils/tqual.h" - PG_MODULE_MAGIC; PG_FUNCTION_INFO_V1(pgrowlocks); diff --git a/contrib/pgstattuple/pgstattuple.c b/contrib/pgstattuple/pgstattuple.c index 10077483d3..c3a8b1d424 100644 --- a/contrib/pgstattuple/pgstattuple.c +++ b/contrib/pgstattuple/pgstattuple.c @@ -36,7 +36,6 @@ #include "utils/builtins.h" #include "utils/tqual.h" - PG_MODULE_MAGIC; PG_FUNCTION_INFO_V1(pgstattuple); diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c index 7dd43a9937..56374905f5 100644 --- a/contrib/postgres_fdw/postgres_fdw.c +++ b/contrib/postgres_fdw/postgres_fdw.c @@ -37,7 +37,6 @@ #include "utils/lsyscache.h" #include "utils/memutils.h" - PG_MODULE_MAGIC; /* Default CPU cost to start up a foreign query. */ diff --git a/contrib/sslinfo/sslinfo.c b/contrib/sslinfo/sslinfo.c index db491a4bc8..641c3f0c84 100644 --- a/contrib/sslinfo/sslinfo.c +++ b/contrib/sslinfo/sslinfo.c @@ -18,10 +18,8 @@ #include #include - PG_MODULE_MAGIC; - static Datum X509_NAME_field_to_text(X509_NAME *name, text *fieldName); static Datum X509_NAME_to_text(X509_NAME *name); static Datum ASN1_STRING_to_text(ASN1_STRING *str); diff --git a/contrib/tcn/tcn.c b/contrib/tcn/tcn.c index ba34f9b1fa..7ad2898308 100644 --- a/contrib/tcn/tcn.c +++ b/contrib/tcn/tcn.c @@ -23,10 +23,8 @@ #include "utils/rel.h" #include "utils/syscache.h" - PG_MODULE_MAGIC; - /* * Copy from s (for source) to r (for result), wrapping with q (quote) * characters and doubling any quote characters found. diff --git a/contrib/test_decoding/test_decoding.c b/contrib/test_decoding/test_decoding.c index 5ce052b5c6..6edc5fcd47 100644 --- a/contrib/test_decoding/test_decoding.c +++ b/contrib/test_decoding/test_decoding.c @@ -30,7 +30,6 @@ #include "utils/syscache.h" #include "utils/typcache.h" - PG_MODULE_MAGIC; /* These must be available to pg_dlsym() */ diff --git a/contrib/test_parser/test_parser.c b/contrib/test_parser/test_parser.c index c41d1eb201..cbf77966ae 100644 --- a/contrib/test_parser/test_parser.c +++ b/contrib/test_parser/test_parser.c @@ -16,7 +16,6 @@ PG_MODULE_MAGIC; - /* * types */ diff --git a/contrib/test_shm_mq/test.c b/contrib/test_shm_mq/test.c index 8750bae8db..95d620f756 100644 --- a/contrib/test_shm_mq/test.c +++ b/contrib/test_shm_mq/test.c @@ -18,7 +18,9 @@ #include "test_shm_mq.h" -PG_MODULE_MAGIC; PG_FUNCTION_INFO_V1(test_shm_mq); +PG_MODULE_MAGIC; + +PG_FUNCTION_INFO_V1(test_shm_mq); PG_FUNCTION_INFO_V1(test_shm_mq_pipelined); void _PG_init(void); diff --git a/contrib/uuid-ossp/uuid-ossp.c b/contrib/uuid-ossp/uuid-ossp.c index 9e9905bfde..db0c6a97aa 100644 --- a/contrib/uuid-ossp/uuid-ossp.c +++ b/contrib/uuid-ossp/uuid-ossp.c @@ -108,10 +108,8 @@ do { \ #endif /* !HAVE_UUID_OSSP */ - PG_MODULE_MAGIC; - PG_FUNCTION_INFO_V1(uuid_nil); PG_FUNCTION_INFO_V1(uuid_ns_dns); PG_FUNCTION_INFO_V1(uuid_ns_url); diff --git a/contrib/xml2/xpath.c b/contrib/xml2/xpath.c index a8b159ebff..f57b81302f 100644 --- a/contrib/xml2/xpath.c +++ b/contrib/xml2/xpath.c @@ -23,7 +23,6 @@ #include #include - PG_MODULE_MAGIC; /* exported for use by xslt_proc.c */ diff --git a/src/backend/snowball/dict_snowball.c b/src/backend/snowball/dict_snowball.c index 37d2966359..545c98c9c6 100644 --- a/src/backend/snowball/dict_snowball.c +++ b/src/backend/snowball/dict_snowball.c @@ -58,7 +58,6 @@ #include "snowball/libstemmer/stem_UTF_8_swedish.h" #include "snowball/libstemmer/stem_UTF_8_turkish.h" - PG_MODULE_MAGIC; PG_FUNCTION_INFO_V1(dsnowball_init); diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c index d57189fe1e..1d025d4653 100644 --- a/src/pl/plperl/plperl.c +++ b/src/pl/plperl/plperl.c @@ -60,7 +60,6 @@ EXTERN_C void boot_PostgreSQL__InServer__SPI(pTHX_ CV *cv); PG_MODULE_MAGIC; - /********************************************************************** * Information associated with a Perl interpreter. We have one interpreter * that is used for all plperlu (untrusted) functions. For plperl (trusted) diff --git a/src/tutorial/complex.c b/src/tutorial/complex.c index 922784004e..a263110cd2 100644 --- a/src/tutorial/complex.c +++ b/src/tutorial/complex.c @@ -12,7 +12,6 @@ #include "fmgr.h" #include "libpq/pqformat.h" /* needed for send/recv functions */ - PG_MODULE_MAGIC; typedef struct Complex diff --git a/src/tutorial/funcs.c b/src/tutorial/funcs.c index e581275856..61ad1417a8 100644 --- a/src/tutorial/funcs.c +++ b/src/tutorial/funcs.c @@ -18,7 +18,6 @@ PG_MODULE_MAGIC; - /* These prototypes just prevent possible warnings from gcc. */ int add_one(int arg); diff --git a/src/tutorial/funcs_new.c b/src/tutorial/funcs_new.c index c8ef458226..abe409b859 100644 --- a/src/tutorial/funcs_new.c +++ b/src/tutorial/funcs_new.c @@ -16,7 +16,6 @@ #include "executor/executor.h" /* for GetAttributeByName() */ #include "utils/geo_decls.h" /* for point type */ - PG_MODULE_MAGIC; /* These prototypes just prevent possible warnings from gcc. */