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

Commita4012a6

Browse files
Rename static function to avoid conflicting names
Commita4fd3aa moved setup_cancel_handler out of psql andexporeted it as a global function. While pg_dump isn't usingthe header it's exported in, having a conflicting name stillrisks causing confusion when grepping the code for callsites,so rename the static function in pg_dump to avoid this.Author: Yugo Nagata <nagata@sraoss.co.jp>Discussion:https://postgr.es/m/20240126094245.cf6718cc659273765f3ab69a@sraoss.co.jp
1 parent1e285a5 commita4012a6

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

‎src/bin/pg_dump/parallel.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ static ParallelSlot *GetMyPSlot(ParallelState *pstate);
204204
staticvoidarchive_close_connection(intcode,void*arg);
205205
staticvoidShutdownWorkersHard(ParallelState*pstate);
206206
staticvoidWaitForTerminatingWorkers(ParallelState*pstate);
207-
staticvoidsetup_cancel_handler(void);
207+
staticvoidset_cancel_handler(void);
208208
staticvoidset_cancel_pstate(ParallelState*pstate);
209209
staticvoidset_cancel_slot_archive(ParallelSlot*slot,ArchiveHandle*AH);
210210
staticvoidRunWorker(ArchiveHandle*AH,ParallelSlot*slot);
@@ -550,7 +550,7 @@ sigTermHandler(SIGNAL_ARGS)
550550
/*
551551
* Some platforms allow delivery of new signals to interrupt an active
552552
* signal handler. That could muck up our attempt to send PQcancel, so
553-
* disable the signals thatsetup_cancel_handler enabled.
553+
* disable the signals thatset_cancel_handler enabled.
554554
*/
555555
pqsignal(SIGINT,SIG_IGN);
556556
pqsignal(SIGTERM,SIG_IGN);
@@ -605,7 +605,7 @@ sigTermHandler(SIGNAL_ARGS)
605605
* Enable cancel interrupt handler, if not already done.
606606
*/
607607
staticvoid
608-
setup_cancel_handler(void)
608+
set_cancel_handler(void)
609609
{
610610
/*
611611
* When forking, signal_info.handler_set will propagate into the new
@@ -705,7 +705,7 @@ consoleHandler(DWORD dwCtrlType)
705705
* Enable cancel interrupt handler, if not already done.
706706
*/
707707
staticvoid
708-
setup_cancel_handler(void)
708+
set_cancel_handler(void)
709709
{
710710
if (!signal_info.handler_set)
711711
{
@@ -737,7 +737,7 @@ set_archive_cancel_info(ArchiveHandle *AH, PGconn *conn)
737737
* important that this happen at least once before we fork off any
738738
* threads.
739739
*/
740-
setup_cancel_handler();
740+
set_cancel_handler();
741741

742742
/*
743743
* On Unix, we assume that storing a pointer value is atomic with respect

0 commit comments

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