diff options
| author | Tom Lane | 2015-03-26 18:03:19 +0000 |
|---|---|---|
| committer | Tom Lane | 2015-03-26 18:03:25 +0000 |
| commit | 785941cdc359c6e595201ffb0df9d28f3f7173a4 (patch) | |
| tree | f1cb5a309c53bf1b9112bc51e99c94bfa55f77c7 /src/include/replication | |
| parent | d04c8ed9044eccebce043143a930617e3998c005 (diff) | |
Tweak __attribute__-wrapping macros for better pgindent results.
This improves on commit bbfd7edae5aa5ad5553d3c7e102f2e450d4380d4 by
making two simple changes:
* pg_attribute_noreturn now takes parentheses, ie pg_attribute_noreturn().
Likewise pg_attribute_unused(), pg_attribute_packed(). This reduces
pgindent's tendency to misformat declarations involving them.
* attributes are now always attached to function declarations, not
definitions. Previously some places were taking creative shortcuts,
which were not merely candidates for bad misformatting by pgindent
but often were outright wrong anyway. (It does little good to put a
noreturn annotation where callers can't see it.) In any case, if
we would like to believe that these macros can be used with non-gcc
compilers, we should avoid gratuitous variance in usage patterns.
I also went through and manually improved the formatting of a lot of
declarations, and got rid of excessively repetitive (and now obsolete
anyway) comments informing the reader what pg_attribute_printf is for.
Diffstat (limited to 'src/include/replication')
| -rw-r--r-- | src/include/replication/walreceiver.h | 2 | ||||
| -rw-r--r-- | src/include/replication/walsender_private.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/include/replication/walreceiver.h b/src/include/replication/walreceiver.h index 4afdf91a6d..61255a9f8e 100644 --- a/src/include/replication/walreceiver.h +++ b/src/include/replication/walreceiver.h @@ -147,7 +147,7 @@ typedef void (*walrcv_disconnect_type) (void); extern PGDLLIMPORT walrcv_disconnect_type walrcv_disconnect; /* prototypes for functions in walreceiver.c */ -extern void WalReceiverMain(void) pg_attribute_noreturn; +extern void WalReceiverMain(void) pg_attribute_noreturn(); /* prototypes for functions in walreceiverfuncs.c */ extern Size WalRcvShmemSize(void); diff --git a/src/include/replication/walsender_private.h b/src/include/replication/walsender_private.h index 40351da47f..6dae480285 100644 --- a/src/include/replication/walsender_private.h +++ b/src/include/replication/walsender_private.h @@ -102,7 +102,7 @@ extern void WalSndSetState(WalSndState state); */ extern int replication_yyparse(void); extern int replication_yylex(void); -extern void replication_yyerror(const char *str); +extern void replication_yyerror(const char *str) pg_attribute_noreturn(); extern void replication_scanner_init(const char *query_string); extern void replication_scanner_finish(void); |