diff options
| author | Álvaro Herrera <alvherre@alvh.no-ip.org> | 2025-04-05 11:22:40 +0200 |
|---|---|---|
| committer | Álvaro Herrera <alvherre@alvh.no-ip.org> | 2025-04-05 11:22:40 +0200 |
| commit | 4be6a74cfb1ef4c50740e4c2f97a3b478c16de73 (patch) | |
| tree | 803f6beafafca600fff29afcd1ae3fe0b3c784d9 /src/bin/pg_dump/pg_backup_archiver.h | |
| parent | f0d0083f52f994989b1bb6723e7bd0fad9f586cd (diff) | |
| download | postgresql-4be6a74cfb1ef4c50740e4c2f97a3b478c16de73.tar.gz postgresql-4be6a74cfb1ef4c50740e4c2f97a3b478c16de73.zip | |
pg_dump: Tiny header cleanup
In commits 9c02e3a986da and 8ec0aaeae094, Nathan added a duplicate
TocEntry typedef forward declaration (plus assorted #ifdef hackery to
avoid C99 preprocessor issues) to deal with some very old untidyness
regarding DefnDumperPtr function prototype being located in pg_backup.h.
But there's no reason to have the DefnDumperPtr typedef (and the
accompanying DataDumperPtr typedef) in that file at all; they are better
placed in pg_backup_archiver.h, the internal header, because they are
only used internally. That also requires zero #ifdef hackery, so move
them there.
Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>
Discussion: https://postgr.es/m/202504042140.qo66ggw6wzsz@alvherre.pgsql
Diffstat (limited to 'src/bin/pg_dump/pg_backup_archiver.h')
| -rw-r--r-- | src/bin/pg_dump/pg_backup_archiver.h | 7 |
1 files changed, 4 insertions, 3 deletions
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; |