pg.ddx.io pgsql-committers@postgresql.org mailing list archive help / color / mirror / Atom feed From: Álvaro Herrera <alvherre@alvh.no-ip.org>
Subject: [PATCH] cleanup pg_dump headers a bit
Date: Fri, 4 Apr 2025 23:39:59 +0200
---
src/bin/pg_dump/pg_backup.h | 10 ----------
src/bin/pg_dump/pg_backup_archiver.h | 7 ++++---
2 files changed, 4 insertions(+), 13 deletions(-)
inline patch 1: src/bin/pg_dump/pg_backup.h, src/bin/pg_dump/pg_backup_archiver.h (+4/-13 lines) download inline-1.patch diff --git a/src/bin/pg_dump/pg_backup.h b/src/bin/pg_dump/pg_backup.h
index 8586cdaf541..af0007fb6d2 100644
--- a/src/bin/pg_dump/pg_backup.h
+++ b/src/bin/pg_dump/pg_backup.h
@@ -284,16 +284,6 @@ typedef int DumpId;
/*
* Function pointer prototypes for assorted callback methods.
*/
-
-/* forward declaration to avoid including pg_backup_archiver.h here */
-#ifndef HAVE_TOCENTRY_TYPEDEF
-typedef struct _tocEntry TocEntry;
-#define HAVE_TOCENTRY_TYPEDEF 1
-#endif
-
-typedef char *(*DefnDumperPtr) (Archive *AH, const void *userArg, const TocEntry *te);
-typedef int (*DataDumperPtr) (Archive *AH, const void *userArg);
-
typedef void (*SetupWorkerPtrType) (Archive *AH);
/*
diff --git a/src/bin/pg_dump/pg_backup_archiver.h b/src/bin/pg_dump/pg_backup_archiver.h
index e81a76ba25e..365073b3eae 100644
--- a/src/bin/pg_dump/pg_backup_archiver.h
+++ b/src/bin/pg_dump/pg_backup_archiver.h
@@ -97,10 +97,7 @@
#define WORKER_IGNORED_ERRORS 12
typedef struct _archiveHandle ArchiveHandle;
-#ifndef HAVE_TOCENTRY_TYPEDEF
typedef struct _tocEntry TocEntry;
-#define HAVE_TOCENTRY_TYPEDEF 1
-#endif
struct ParallelState;
#define READ_ERROR_EXIT(fd) \
@@ -344,6 +341,10 @@ struct _archiveHandle
struct _tocEntry *lastErrorTE;
};
+
+typedef char *(*DefnDumperPtr) (Archive *AH, const void *userArg, const TocEntry *te);
+typedef int (*DataDumperPtr) (Archive *AH, const void *userArg);
+
struct _tocEntry
{
struct _tocEntry *prev;
--
2.39.5
Message-ID: <no-message-id-21348@localhost>
Permalink: ../no-message-id-21348@localhost/
Also on: postgresql.org/message-id/no-message-id-21348@localhost
copy link · copy postgr.es · copy git am
reply Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients using the --to and --cc options:
reply via email
To: pgsql-committers@postgresql.org
Cc: alvherre@alvh.no-ip.org
Subject: Re: [PATCH] cleanup pg_dump headers a bit
In-Reply-To: <no-message-id-21348@localhost>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox