database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-11 05:41:32 +03:00
Code

Add noreturn attributes to some error reporting functions

Browse Source
This commit is contained in:
Peter Eisentraut 2013-02-12 07:13:22 -05:00
parent 62401db45c
commit 0cb1fac3b1
8 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/cube/cubescan.l
View File

@ -60,7 +60,7 @@ float ({integer}|{real})([eE]{integer})?
%% %%
void void __attribute__((noreturn))
yyerror(const char *message) yyerror(const char *message)
{ {
if (*yytext == YY_END_OF_BUFFER_CHAR) if (*yytext == YY_END_OF_BUFFER_CHAR)

2
contrib/seg/segscan.l
View File

@ -59,7 +59,7 @@ float ({integer}|{real})([eE]{integer})?
%% %%
void void __attribute__((noreturn))
yyerror(const char *message) yyerror(const char *message)
{ {
if (*yytext == YY_END_OF_BUFFER_CHAR) if (*yytext == YY_END_OF_BUFFER_CHAR)

2
src/backend/replication/repl_scanner.l
View File

@ -152,7 +152,7 @@ addlitchar(unsigned char ychar)
appendStringInfoChar(&litbuf, ychar); appendStringInfoChar(&litbuf, ychar);
} }
void void __attribute__((noreturn))
yyerror(const char *message) yyerror(const char *message)
{ {
ereport(ERROR, ereport(ERROR,

4
src/include/mb/pg_wchar.h
View File

@ -516,9 +516,9 @@ extern void check_encoding_conversion_args(int src_encoding,
int expected_src_encoding, int expected_src_encoding,
int expected_dest_encoding); int expected_dest_encoding);
extern void report_invalid_encoding(int encoding, const char *mbstr, int len); extern void report_invalid_encoding(int encoding, const char *mbstr, int len) __attribute__((noreturn));
extern void report_untranslatable_char(int src_encoding, int dest_encoding, extern void report_untranslatable_char(int src_encoding, int dest_encoding,
const char *mbstr, int len); const char *mbstr, int len) __attribute__((noreturn));
extern void pg_ascii2mic(const unsigned char *l, unsigned char *p, int len); extern void pg_ascii2mic(const unsigned char *l, unsigned char *p, int len);
extern void pg_mic2ascii(const unsigned char *mic, unsigned char *p, int len); extern void pg_mic2ascii(const unsigned char *mic, unsigned char *p, int len);

4
src/include/parser/parse_relation.h
View File

@ -84,9 +84,9 @@ extern bool isLockedRefname(ParseState *pstate, const char *refname);
extern void addRTEtoQuery(ParseState *pstate, RangeTblEntry *rte, extern void addRTEtoQuery(ParseState *pstate, RangeTblEntry *rte,
bool addToJoinList, bool addToJoinList,
bool addToRelNameSpace, bool addToVarNameSpace); bool addToRelNameSpace, bool addToVarNameSpace);
extern void errorMissingRTE(ParseState *pstate, RangeVar *relation); extern void errorMissingRTE(ParseState *pstate, RangeVar *relation) __attribute__((noreturn));
extern void errorMissingColumn(ParseState *pstate, extern void errorMissingColumn(ParseState *pstate,
char *relname, char *colname, int location); char *relname, char *colname, int location) __attribute__((noreturn));
extern void expandRTE(RangeTblEntry *rte, int rtindex, int sublevels_up, extern void expandRTE(RangeTblEntry *rte, int rtindex, int sublevels_up,
int location, bool include_dropped, int location, bool include_dropped,
List **colnames, List **colvars); List **colnames, List **colvars);

2
src/include/storage/lock.h
View File

@ -533,7 +533,7 @@ extern void lock_twophase_standby_recover(TransactionId xid, uint16 info,
extern DeadLockState DeadLockCheck(PGPROC *proc); extern DeadLockState DeadLockCheck(PGPROC *proc);
extern PGPROC *GetBlockingAutoVacuumPgproc(void); extern PGPROC *GetBlockingAutoVacuumPgproc(void);
extern void DeadLockReport(void); extern void DeadLockReport(void) __attribute__((noreturn));
extern void RememberSimpleDeadLock(PGPROC *proc1, extern void RememberSimpleDeadLock(PGPROC *proc1,
LOCKMODE lockmode, LOCKMODE lockmode,
LOCK *lock, LOCK *lock,

2
src/include/tcop/tcopprot.h
View File

@ -64,7 +64,7 @@ extern void assign_max_stack_depth(int newval, void *extra);
extern void die(SIGNAL_ARGS); extern void die(SIGNAL_ARGS);
extern void quickdie(SIGNAL_ARGS) __attribute__((noreturn)); extern void quickdie(SIGNAL_ARGS) __attribute__((noreturn));
extern void StatementCancelHandler(SIGNAL_ARGS); extern void StatementCancelHandler(SIGNAL_ARGS);
extern void FloatExceptionHandler(SIGNAL_ARGS); extern void FloatExceptionHandler(SIGNAL_ARGS) __attribute__((noreturn));
extern void RecoveryConflictInterrupt(ProcSignalReason reason); /* called from SIGUSR1 extern void RecoveryConflictInterrupt(ProcSignalReason reason); /* called from SIGUSR1
* handler */ * handler */
extern void prepare_for_client_read(void); extern void prepare_for_client_read(void);

2
src/pl/plpgsql/src/pl_scanner.c
View File

@ -528,7 +528,7 @@ plpgsql_scanner_errposition(int location)
* Beware of using yyerror for other purposes, as the cursor position might * Beware of using yyerror for other purposes, as the cursor position might
* be misleading! * be misleading!
*/ */
void void __attribute__((noreturn))
plpgsql_yyerror(const char *message) plpgsql_yyerror(const char *message)
{ {
char *yytext = core_yy.scanbuf + plpgsql_yylloc; char *yytext = core_yy.scanbuf + plpgsql_yylloc;