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

Commit aafc07c

Browse files
committed
Move src/bin/pg_verifybackup/parse_manifest.c into src/common.
This makes it possible for the code to be easily reused by other client-side tools, and/or by the server. Patch by me. Review of this patch in particular by at least Peter Eisentraut; reviewers for the patch series in general include Dilip Kumar, Andres Fruend, David Steele, Álvaro Herrera, and Jakub Wartak. Discussion: http://postgr.es/m/CA+TgmoZ6UGZVnSy5iak6s6+AXu_DewXovDjhLs3-su6nmU_x_g@mail.gmail.com
1 parent 47f01d7 commit aafc07c

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

src/bin/pg_verifybackup/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ LDFLAGS_INTERNAL += -L$(top_builddir)/src/fe_utils -lpgfeutils $(libpq_pgport)
2121

2222
OBJS = \
2323
$(WIN32RES) \
24-
parse_manifest.o \
2524
pg_verifybackup.o
2625

2726
all: pg_verifybackup

src/bin/pg_verifybackup/meson.build

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Copyright (c) 2022-2023, PostgreSQL Global Development Group
22

33
pg_verifybackup_sources = files(
4-
'parse_manifest.c',
54
'pg_verifybackup.c'
65
)
76

src/bin/pg_verifybackup/nls.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# src/bin/pg_verifybackup/nls.mk
22
CATALOG_NAME = pg_verifybackup
33
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
4-
parse_manifest.c \
54
pg_verifybackup.c \
65
../../common/fe_memutils.c \
7-
../../common/jsonapi.c
6+
../../common/jsonapi.c \
7+
../../common/parse_manifest.c
88
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) \
99
json_manifest_parse_failure:2 \
1010
error_cb:2 \

src/bin/pg_verifybackup/pg_verifybackup.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
#include "common/hashfn.h"
2222
#include "common/logging.h"
23+
#include "common/parse_manifest.h"
2324
#include "fe_utils/simple_list.h"
2425
#include "getopt_long.h"
25-
#include "parse_manifest.h"
2626
#include "pgtime.h"
2727

2828
/*

src/common/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ OBJS_COMMON = \
6666
kwlookup.o \
6767
link-canary.o \
6868
md5_common.o \
69+
parse_manifest.o \
6970
percentrepl.o \
7071
pg_get_line.o \
7172
pg_lzcompress.o \

src/common/meson.build

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ common_sources = files(
1818
'kwlookup.c',
1919
'link-canary.c',
2020
'md5_common.c',
21+
'parse_manifest.c',
2122
'percentrepl.c',
2223
'pg_get_line.c',
2324
'pg_lzcompress.c',

src/bin/pg_verifybackup/parse_manifest.c renamed to src/common/parse_manifest.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
* Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
9-
* src/bin/pg_verifybackup/parse_manifest.c
9+
* src/common/parse_manifest.c
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
1313

1414
#include "postgres_fe.h"
1515

16-
#include "parse_manifest.h"
1716
#include "common/jsonapi.h"
17+
#include "common/parse_manifest.h"
1818

1919
/*
2020
* Semantic states for JSON manifest parsing.

src/bin/pg_verifybackup/parse_manifest.h renamed to src/include/common/parse_manifest.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
9-
* src/bin/pg_verifybackup/parse_manifest.h
9+
* src/include/common/parse_manifest.h
1010
*
1111
*-------------------------------------------------------------------------
1212
*/

0 commit comments

Comments
 (0)