diff --git a/src/bin/pg_verifybackup/Makefile b/src/bin/pg_verifybackup/Makefile index c96323faa9..7c045f142e 100644 --- a/src/bin/pg_verifybackup/Makefile +++ b/src/bin/pg_verifybackup/Makefile @@ -21,7 +21,6 @@ LDFLAGS_INTERNAL += -L$(top_builddir)/src/fe_utils -lpgfeutils $(libpq_pgport) OBJS = \ $(WIN32RES) \ - parse_manifest.o \ pg_verifybackup.o all: pg_verifybackup diff --git a/src/bin/pg_verifybackup/meson.build b/src/bin/pg_verifybackup/meson.build index 9369da1bc6..58f780d1a6 100644 --- a/src/bin/pg_verifybackup/meson.build +++ b/src/bin/pg_verifybackup/meson.build @@ -1,7 +1,6 @@ # Copyright (c) 2022-2023, PostgreSQL Global Development Group pg_verifybackup_sources = files( - 'parse_manifest.c', 'pg_verifybackup.c' ) diff --git a/src/bin/pg_verifybackup/nls.mk b/src/bin/pg_verifybackup/nls.mk index eba73a2c05..9e6a6049ba 100644 --- a/src/bin/pg_verifybackup/nls.mk +++ b/src/bin/pg_verifybackup/nls.mk @@ -1,10 +1,10 @@ # src/bin/pg_verifybackup/nls.mk CATALOG_NAME = pg_verifybackup GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \ - parse_manifest.c \ pg_verifybackup.c \ ../../common/fe_memutils.c \ - ../../common/jsonapi.c + ../../common/jsonapi.c \ + ../../common/parse_manifest.c GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) \ json_manifest_parse_failure:2 \ error_cb:2 \ diff --git a/src/bin/pg_verifybackup/pg_verifybackup.c b/src/bin/pg_verifybackup/pg_verifybackup.c index d921d0f003..88081f66f7 100644 --- a/src/bin/pg_verifybackup/pg_verifybackup.c +++ b/src/bin/pg_verifybackup/pg_verifybackup.c @@ -20,9 +20,9 @@ #include "common/hashfn.h" #include "common/logging.h" +#include "common/parse_manifest.h" #include "fe_utils/simple_list.h" #include "getopt_long.h" -#include "parse_manifest.h" #include "pgtime.h" /* diff --git a/src/common/Makefile b/src/common/Makefile index ce4535d7fe..1092dc63df 100644 --- a/src/common/Makefile +++ b/src/common/Makefile @@ -66,6 +66,7 @@ OBJS_COMMON = \ kwlookup.o \ link-canary.o \ md5_common.o \ + parse_manifest.o \ percentrepl.o \ pg_get_line.o \ pg_lzcompress.o \ diff --git a/src/common/meson.build b/src/common/meson.build index 8be145c0fb..d52dd12bc9 100644 --- a/src/common/meson.build +++ b/src/common/meson.build @@ -18,6 +18,7 @@ common_sources = files( 'kwlookup.c', 'link-canary.c', 'md5_common.c', + 'parse_manifest.c', 'percentrepl.c', 'pg_get_line.c', 'pg_lzcompress.c', diff --git a/src/bin/pg_verifybackup/parse_manifest.c b/src/common/parse_manifest.c similarity index 99% rename from src/bin/pg_verifybackup/parse_manifest.c rename to src/common/parse_manifest.c index 850adf90a8..9f52bfa83b 100644 --- a/src/bin/pg_verifybackup/parse_manifest.c +++ b/src/common/parse_manifest.c @@ -6,15 +6,15 @@ * Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * src/bin/pg_verifybackup/parse_manifest.c + * src/common/parse_manifest.c * *------------------------------------------------------------------------- */ #include "postgres_fe.h" -#include "parse_manifest.h" #include "common/jsonapi.h" +#include "common/parse_manifest.h" /* * Semantic states for JSON manifest parsing. diff --git a/src/bin/pg_verifybackup/parse_manifest.h b/src/include/common/parse_manifest.h similarity index 97% rename from src/bin/pg_verifybackup/parse_manifest.h rename to src/include/common/parse_manifest.h index 001b9a6a11..811c9149f4 100644 --- a/src/bin/pg_verifybackup/parse_manifest.h +++ b/src/include/common/parse_manifest.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * src/bin/pg_verifybackup/parse_manifest.h + * src/include/common/parse_manifest.h * *------------------------------------------------------------------------- */