diff options
Diffstat (limited to 'src/bin/pg_dump/pg_backup_null.c')
| -rw-r--r-- | src/bin/pg_dump/pg_backup_null.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/bin/pg_dump/pg_backup_null.c b/src/bin/pg_dump/pg_backup_null.c index 77cf3fdc51..848eed49d0 100644 --- a/src/bin/pg_dump/pg_backup_null.c +++ b/src/bin/pg_dump/pg_backup_null.c @@ -33,8 +33,8 @@ static void _WriteBlobData(ArchiveHandle *AH, const void *data, size_t dLen); static void _EndData(ArchiveHandle *AH, TocEntry *te); static int _WriteByte(ArchiveHandle *AH, const int i); static void _WriteBuf(ArchiveHandle *AH, const void *buf, size_t len); -static void _CloseArchive(ArchiveHandle *AH, DumpOptions *dopt); -static void _PrintTocData(ArchiveHandle *AH, TocEntry *te, RestoreOptions *ropt); +static void _CloseArchive(ArchiveHandle *AH); +static void _PrintTocData(ArchiveHandle *AH, TocEntry *te); static void _StartBlobs(ArchiveHandle *AH, TocEntry *te); static void _StartBlob(ArchiveHandle *AH, TocEntry *te, Oid oid); static void _EndBlob(ArchiveHandle *AH, TocEntry *te, Oid oid); @@ -149,7 +149,7 @@ _StartBlob(ArchiveHandle *AH, TocEntry *te, Oid oid) exit_horribly(NULL, "invalid OID for large object\n"); /* With an old archive we must do drop and create logic here */ - if (old_blob_style && AH->ropt->dropSchema) + if (old_blob_style && AH->public.ropt->dropSchema) DropBlobIfExists(AH, oid); if (old_blob_style) @@ -192,20 +192,16 @@ _EndBlobs(ArchiveHandle *AH, TocEntry *te) *------ */ static void -_PrintTocData(ArchiveHandle *AH, TocEntry *te, RestoreOptions *ropt) +_PrintTocData(ArchiveHandle *AH, TocEntry *te) { if (te->dataDumper) { - DumpOptions *dopt; - AH->currToc = te; if (strcmp(te->desc, "BLOBS") == 0) _StartBlobs(AH, te); - dopt = dumpOptionsFromRestoreOptions(ropt); - (*te->dataDumper) ((Archive *) AH, dopt, te->dataDumperArg); - pg_free(dopt); + (*te->dataDumper) ((Archive *) AH, te->dataDumperArg); if (strcmp(te->desc, "BLOBS") == 0) _EndBlobs(AH, te); @@ -229,7 +225,7 @@ _WriteBuf(ArchiveHandle *AH, const void *buf, size_t len) } static void -_CloseArchive(ArchiveHandle *AH, DumpOptions *dopt) +_CloseArchive(ArchiveHandle *AH) { /* Nothing to do */ } |