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

Commitfcf70e0

Browse files
committed
Re-pgindent src/bin/pg_dump/*
Cleanup for recent patches --- it's not much change, but I got annoyedwhile re-indenting the view-rule fix I'm working on.
1 parentf65b94f commitfcf70e0

File tree

3 files changed

+29
-18
lines changed

3 files changed

+29
-18
lines changed

‎src/bin/pg_dump/pg_backup_archiver.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2108,7 +2108,9 @@ _discoverArchiveFormat(ArchiveHandle *AH)
21082108
if (strncmp(sig,"PGDMP",5)==0)
21092109
{
21102110
intbyteread;
2111-
charvmaj,vmin,vrev;
2111+
charvmaj,
2112+
vmin,
2113+
vrev;
21122114

21132115
/*
21142116
* Finish reading (most of) a custom-format header.
@@ -3563,7 +3565,9 @@ ReadHead(ArchiveHandle *AH)
35633565
*/
35643566
if (!AH->readHeader)
35653567
{
3566-
charvmaj,vmin,vrev;
3568+
charvmaj,
3569+
vmin,
3570+
vrev;
35673571

35683572
(*AH->ReadBufPtr) (AH,tmpMag,5);
35693573

‎src/bin/pg_dump/pg_backup_archiver.h

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -71,28 +71,33 @@ typedef z_stream *z_streamp;
7171

7272
#defineARCHIVE_MAJOR(version) (((version) >> 16) & 255)
7373
#defineARCHIVE_MINOR(version) (((version) >> 8) & 255)
74-
#defineARCHIVE_REV(version) (((version)) & 255)
74+
#defineARCHIVE_REV(version) (((version)) & 255)
7575

7676
/* Historical version numbers (checked in code) */
7777
#defineK_VERS_1_0MAKE_ARCHIVE_VERSION(1, 0, 0)
78-
#defineK_VERS_1_2MAKE_ARCHIVE_VERSION(1, 2, 0)/* Allow No ZLIB */
79-
#defineK_VERS_1_3MAKE_ARCHIVE_VERSION(1, 3, 0)/* BLOBs */
80-
#defineK_VERS_1_4MAKE_ARCHIVE_VERSION(1, 4, 0)/* Date & name in header */
81-
#defineK_VERS_1_5MAKE_ARCHIVE_VERSION(1, 5, 0)/* Handle dependencies */
82-
#defineK_VERS_1_6MAKE_ARCHIVE_VERSION(1, 6, 0)/* Schema field in TOCs */
83-
#defineK_VERS_1_7MAKE_ARCHIVE_VERSION(1, 7, 0)/* File Offset size in header */
84-
#defineK_VERS_1_8MAKE_ARCHIVE_VERSION(1, 8, 0)/* change interpretation of ID
85-
numbers and dependencies */
86-
#defineK_VERS_1_9MAKE_ARCHIVE_VERSION(1, 9, 0)/* add default_with_oids tracking */
87-
#defineK_VERS_1_10MAKE_ARCHIVE_VERSION(1, 10, 0)/* add tablespace */
88-
#defineK_VERS_1_11MAKE_ARCHIVE_VERSION(1, 11, 0)/* add toc section indicator */
89-
#defineK_VERS_1_12MAKE_ARCHIVE_VERSION(1, 12, 0)/* add separate BLOB entries */
78+
#defineK_VERS_1_2MAKE_ARCHIVE_VERSION(1, 2, 0)/* Allow No ZLIB */
79+
#defineK_VERS_1_3MAKE_ARCHIVE_VERSION(1, 3, 0)/* BLOBs */
80+
#defineK_VERS_1_4MAKE_ARCHIVE_VERSION(1, 4, 0)/* Date & name in header */
81+
#defineK_VERS_1_5MAKE_ARCHIVE_VERSION(1, 5, 0)/* Handle dependencies */
82+
#defineK_VERS_1_6MAKE_ARCHIVE_VERSION(1, 6, 0)/* Schema field in TOCs */
83+
#defineK_VERS_1_7MAKE_ARCHIVE_VERSION(1, 7, 0)/* File Offset size in
84+
* header */
85+
#defineK_VERS_1_8MAKE_ARCHIVE_VERSION(1, 8, 0)/* change interpretation
86+
* of ID numbers and
87+
* dependencies */
88+
#defineK_VERS_1_9MAKE_ARCHIVE_VERSION(1, 9, 0)/* add default_with_oids
89+
* tracking */
90+
#defineK_VERS_1_10 MAKE_ARCHIVE_VERSION(1, 10, 0)/* add tablespace */
91+
#defineK_VERS_1_11 MAKE_ARCHIVE_VERSION(1, 11, 0)/* add toc section
92+
* indicator */
93+
#defineK_VERS_1_12 MAKE_ARCHIVE_VERSION(1, 12, 0)/* add separate BLOB
94+
* entries */
9095

9196
/* Current archive version number (the format we can output) */
9297
#defineK_VERS_MAJOR 1
9398
#defineK_VERS_MINOR 12
9499
#defineK_VERS_REV 0
95-
#defineK_VERS_SELFMAKE_ARCHIVE_VERSION(K_VERS_MAJOR, K_VERS_MINOR, K_VERS_REV);
100+
#defineK_VERS_SELFMAKE_ARCHIVE_VERSION(K_VERS_MAJOR, K_VERS_MINOR, K_VERS_REV);
96101

97102
/* Newest format we can read */
98103
#defineK_VERS_MAXMAKE_ARCHIVE_VERSION(K_VERS_MAJOR, K_VERS_MINOR, 255)

‎src/bin/pg_dump/pg_dump.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -546,9 +546,11 @@ main(int argc, char **argv)
546546
if (dopt.column_inserts)
547547
dopt.dump_inserts=1;
548548

549-
/* Binary upgrade mode implies dumping sequence data even in schema-only
549+
/*
550+
* Binary upgrade mode implies dumping sequence data even in schema-only
550551
* mode. This is not exposed as a separate option, but kept separate
551-
* internally for clarity. */
552+
* internally for clarity.
553+
*/
552554
if (dopt.binary_upgrade)
553555
dopt.sequence_data=1;
554556

0 commit comments

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