Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit0cb1fac

Browse files
committed
Add noreturn attributes to some error reporting functions
1 parent62401db commit0cb1fac

File tree

8 files changed

+10
-10
lines changed

8 files changed

+10
-10
lines changed

‎contrib/cube/cubescan.l

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ float ({integer}|{real})([eE]{integer})?
6060

6161
%%
6262

63-
void
63+
void__attribute__((noreturn))
6464
yyerror(constchar *message)
6565
{
6666
if (*yytext == YY_END_OF_BUFFER_CHAR)

‎contrib/seg/segscan.l

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ float ({integer}|{real})([eE]{integer})?
5959

6060
%%
6161

62-
void
62+
void__attribute__((noreturn))
6363
yyerror(constchar *message)
6464
{
6565
if (*yytext == YY_END_OF_BUFFER_CHAR)

‎src/backend/replication/repl_scanner.l

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ addlitchar(unsigned char ychar)
152152
appendStringInfoChar(&litbuf, ychar);
153153
}
154154

155-
void
155+
void__attribute__((noreturn))
156156
yyerror(constchar *message)
157157
{
158158
ereport(ERROR,

‎src/include/mb/pg_wchar.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -516,9 +516,9 @@ extern void check_encoding_conversion_args(int src_encoding,
516516
intexpected_src_encoding,
517517
intexpected_dest_encoding);
518518

519-
externvoidreport_invalid_encoding(intencoding,constchar*mbstr,intlen);
519+
externvoidreport_invalid_encoding(intencoding,constchar*mbstr,intlen) __attribute__((noreturn));
520520
externvoidreport_untranslatable_char(intsrc_encoding,intdest_encoding,
521-
constchar*mbstr,intlen);
521+
constchar*mbstr,intlen) __attribute__((noreturn));
522522

523523
externvoidpg_ascii2mic(constunsignedchar*l,unsignedchar*p,intlen);
524524
externvoidpg_mic2ascii(constunsignedchar*mic,unsignedchar*p,intlen);

‎src/include/parser/parse_relation.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ extern bool isLockedRefname(ParseState *pstate, const char *refname);
8484
externvoidaddRTEtoQuery(ParseState*pstate,RangeTblEntry*rte,
8585
booladdToJoinList,
8686
booladdToRelNameSpace,booladdToVarNameSpace);
87-
externvoiderrorMissingRTE(ParseState*pstate,RangeVar*relation);
87+
externvoiderrorMissingRTE(ParseState*pstate,RangeVar*relation) __attribute__((noreturn));
8888
externvoiderrorMissingColumn(ParseState*pstate,
89-
char*relname,char*colname,intlocation);
89+
char*relname,char*colname,intlocation) __attribute__((noreturn));
9090
externvoidexpandRTE(RangeTblEntry*rte,intrtindex,intsublevels_up,
9191
intlocation,boolinclude_dropped,
9292
List**colnames,List**colvars);

‎src/include/storage/lock.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ extern void lock_twophase_standby_recover(TransactionId xid, uint16 info,
533533

534534
externDeadLockStateDeadLockCheck(PGPROC*proc);
535535
externPGPROC*GetBlockingAutoVacuumPgproc(void);
536-
externvoidDeadLockReport(void);
536+
externvoidDeadLockReport(void) __attribute__((noreturn));
537537
externvoidRememberSimpleDeadLock(PGPROC*proc1,
538538
LOCKMODElockmode,
539539
LOCK*lock,

‎src/include/tcop/tcopprot.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ extern void assign_max_stack_depth(int newval, void *extra);
6464
externvoiddie(SIGNAL_ARGS);
6565
externvoidquickdie(SIGNAL_ARGS) __attribute__((noreturn));
6666
externvoidStatementCancelHandler(SIGNAL_ARGS);
67-
externvoidFloatExceptionHandler(SIGNAL_ARGS);
67+
externvoidFloatExceptionHandler(SIGNAL_ARGS) __attribute__((noreturn));
6868
externvoidRecoveryConflictInterrupt(ProcSignalReasonreason);/* called from SIGUSR1
6969
* handler */
7070
externvoidprepare_for_client_read(void);

‎src/pl/plpgsql/src/pl_scanner.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ plpgsql_scanner_errposition(int location)
528528
* Beware of using yyerror for other purposes, as the cursor position might
529529
* be misleading!
530530
*/
531-
void
531+
void __attribute__((noreturn))
532532
plpgsql_yyerror(constchar*message)
533533
{
534534
char*yytext=core_yy.scanbuf+plpgsql_yylloc;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp