Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 2e810bd

Browse files
committed
Make formatting in nls.mk files more consistent
Some of the nls.mk files used different indentation or line breaks than the majority, which makes editing these files unnecessarily confusing.
1 parent e87e732 commit 2e810bd

File tree

7 files changed

+51
-42
lines changed

7 files changed

+51
-42
lines changed

src/backend/nls.mk

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@
22
CATALOG_NAME = postgres
33
GETTEXT_FILES = + gettext-files
44
GETTEXT_TRIGGERS = $(BACKEND_COMMON_GETTEXT_TRIGGERS) \
5-
GUC_check_errmsg \
6-
GUC_check_errdetail \
7-
GUC_check_errhint \
8-
write_stderr \
9-
yyerror \
10-
jsonpath_yyerror:3 \
11-
parser_yyerror \
12-
replication_yyerror \
13-
scanner_yyerror \
14-
syncrep_yyerror \
15-
report_invalid_record:2 \
16-
ereport_startup_progress
5+
GUC_check_errmsg \
6+
GUC_check_errdetail \
7+
GUC_check_errhint \
8+
write_stderr \
9+
yyerror \
10+
jsonpath_yyerror:3 \
11+
parser_yyerror \
12+
replication_yyerror \
13+
scanner_yyerror \
14+
syncrep_yyerror \
15+
report_invalid_record:2 \
16+
ereport_startup_progress
1717
GETTEXT_FLAGS = $(BACKEND_COMMON_GETTEXT_FLAGS) \
18-
GUC_check_errmsg:1:c-format \
19-
GUC_check_errdetail:1:c-format \
20-
GUC_check_errhint:1:c-format \
21-
write_stderr:1:c-format \
22-
report_invalid_record:2:c-format \
23-
ereport_startup_progress:1:c-format
18+
GUC_check_errmsg:1:c-format \
19+
GUC_check_errdetail:1:c-format \
20+
GUC_check_errhint:1:c-format \
21+
write_stderr:1:c-format \
22+
report_invalid_record:2:c-format \
23+
ereport_startup_progress:1:c-format
2424

2525
gettext-files: generated-parser-sources generated-headers
2626
find $(srcdir) $(srcdir)/../common $(srcdir)/../port -name '*.c' -print | LC_ALL=C sort >$@

src/bin/pg_combinebackup/nls.mk

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# src/bin/pg_combinebackup/nls.mk
22
CATALOG_NAME = pg_combinebackup
33
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
4-
backup_label.c \
5-
copy_file.c \
6-
load_manifest.c \
7-
pg_combinebackup.c \
8-
reconstruct.c \
9-
write_manifest.c
4+
backup_label.c \
5+
copy_file.c \
6+
load_manifest.c \
7+
pg_combinebackup.c \
8+
reconstruct.c \
9+
write_manifest.c
1010
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS)
1111
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS)

src/bin/pg_dump/nls.mk

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
3030
../../fe_utils/option_utils.c
3131
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) \
3232
simple_prompt \
33-
ExecuteSqlCommand:3 warn_or_exit_horribly:2
33+
ExecuteSqlCommand:3 \
34+
warn_or_exit_horribly:2
3435
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) \
35-
warn_or_exit_horribly:2:c-format
36+
warn_or_exit_horribly:2:c-format

src/bin/pg_rewind/nls.mk

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
1515
../../common/restricted_token.c \
1616
../../fe_utils/archive.c \
1717
../../fe_utils/recovery_gen.c
18-
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) report_invalid_record:2
18+
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) \
19+
report_invalid_record:2
1920
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) \
20-
report_invalid_record:2:c-format
21+
report_invalid_record:2:c-format

src/bin/pg_upgrade/nls.mk

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,13 @@ GETTEXT_FILES = check.c \
1515
tablespace.c \
1616
util.c \
1717
version.c
18-
GETTEXT_TRIGGERS = pg_fatal pg_log:2 prep_status prep_status_progress report_status:2
19-
GETTEXT_FLAGS = \
20-
pg_fatal:1:c-format \
21-
pg_log:2:c-format \
22-
prep_status:1:c-format \
23-
prep_status_progress:1:c-format \
24-
report_status:2:c-format
18+
GETTEXT_TRIGGERS = pg_fatal \
19+
pg_log:2 \
20+
prep_status \
21+
prep_status_progress \
22+
report_status:2
23+
GETTEXT_FLAGS = pg_fatal:1:c-format \
24+
pg_log:2:c-format \
25+
prep_status:1:c-format \
26+
prep_status_progress:1:c-format \
27+
report_status:2:c-format

src/bin/pg_waldump/nls.mk

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
44
pg_waldump.c \
55
xlogreader.c \
66
xlogstats.c
7-
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) report_invalid_record:2
7+
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) \
8+
report_invalid_record:2
89
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) \
9-
report_invalid_record:2:c-format
10+
report_invalid_record:2:c-format

src/pl/plpython/nls.mk

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,12 @@ GETTEXT_FILES = plpy_cursorobject.c \
1212
plpy_subxactobject.c \
1313
plpy_typeio.c \
1414
plpy_util.c
15-
GETTEXT_TRIGGERS = $(BACKEND_COMMON_GETTEXT_TRIGGERS) PLy_elog:2 PLy_exception_set:2 PLy_exception_set_plural:2,3
15+
GETTEXT_TRIGGERS = $(BACKEND_COMMON_GETTEXT_TRIGGERS) \
16+
PLy_elog:2 \
17+
PLy_exception_set:2 \
18+
PLy_exception_set_plural:2,3
1619
GETTEXT_FLAGS = $(BACKEND_COMMON_GETTEXT_FLAGS) \
17-
PLy_elog:2:c-format \
18-
PLy_exception_set:2:c-format \
19-
PLy_exception_set_plural:2:c-format \
20-
PLy_exception_set_plural:3:c-format
20+
PLy_elog:2:c-format \
21+
PLy_exception_set:2:c-format \
22+
PLy_exception_set_plural:2:c-format \
23+
PLy_exception_set_plural:3:c-format

0 commit comments

Comments
 (0)