Commit 19f45565 authored by Peter Eisentraut's avatar Peter Eisentraut

pg_dump: Remove undocumented "files" output format

This was for demonstration only, and now it was creating compiler
warnings from zlib without an obvious fix (see also
d923125b), let's just remove it.  The
"directory" format is presumably similar enough anyway.
parent 9dbf2b7d
...@@ -19,7 +19,7 @@ include $(top_builddir)/src/Makefile.global ...@@ -19,7 +19,7 @@ include $(top_builddir)/src/Makefile.global
override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
OBJS= pg_backup_archiver.o pg_backup_db.o pg_backup_custom.o \ OBJS= pg_backup_archiver.o pg_backup_db.o pg_backup_custom.o \
pg_backup_files.o pg_backup_null.o pg_backup_tar.o \ pg_backup_null.o pg_backup_tar.o \
pg_backup_directory.o dumpmem.o dumputils.o compress_io.o $(WIN32RES) pg_backup_directory.o dumpmem.o dumputils.o compress_io.o $(WIN32RES)
KEYWRDOBJS = keywords.o kwlookup.o KEYWRDOBJS = keywords.o kwlookup.o
......
...@@ -48,7 +48,6 @@ typedef enum _archiveFormat ...@@ -48,7 +48,6 @@ typedef enum _archiveFormat
{ {
archUnknown = 0, archUnknown = 0,
archCustom = 1, archCustom = 1,
archFiles = 2,
archTar = 3, archTar = 3,
archNull = 4, archNull = 4,
archDirectory = 5 archDirectory = 5
......
...@@ -827,9 +827,6 @@ PrintTOCSummary(Archive *AHX, RestoreOptions *ropt) ...@@ -827,9 +827,6 @@ PrintTOCSummary(Archive *AHX, RestoreOptions *ropt)
switch (AH->format) switch (AH->format)
{ {
case archFiles:
fmtName = "FILES";
break;
case archCustom: case archCustom:
fmtName = "CUSTOM"; fmtName = "CUSTOM";
break; break;
...@@ -2017,10 +2014,6 @@ _allocAH(const char *FileSpec, const ArchiveFormat fmt, ...@@ -2017,10 +2014,6 @@ _allocAH(const char *FileSpec, const ArchiveFormat fmt,
InitArchiveFmt_Custom(AH); InitArchiveFmt_Custom(AH);
break; break;
case archFiles:
InitArchiveFmt_Files(AH);
break;
case archNull: case archNull:
InitArchiveFmt_Null(AH); InitArchiveFmt_Null(AH);
break; break;
......
...@@ -363,7 +363,6 @@ extern void EndRestoreBlob(ArchiveHandle *AH, Oid oid); ...@@ -363,7 +363,6 @@ extern void EndRestoreBlob(ArchiveHandle *AH, Oid oid);
extern void EndRestoreBlobs(ArchiveHandle *AH); extern void EndRestoreBlobs(ArchiveHandle *AH);
extern void InitArchiveFmt_Custom(ArchiveHandle *AH); extern void InitArchiveFmt_Custom(ArchiveHandle *AH);
extern void InitArchiveFmt_Files(ArchiveHandle *AH);
extern void InitArchiveFmt_Null(ArchiveHandle *AH); extern void InitArchiveFmt_Null(ArchiveHandle *AH);
extern void InitArchiveFmt_Directory(ArchiveHandle *AH); extern void InitArchiveFmt_Directory(ArchiveHandle *AH);
extern void InitArchiveFmt_Tar(ArchiveHandle *AH); extern void InitArchiveFmt_Tar(ArchiveHandle *AH);
......
This diff is collapsed.
...@@ -934,13 +934,6 @@ parseArchiveFormat(const char *format, ArchiveMode *mode) ...@@ -934,13 +934,6 @@ parseArchiveFormat(const char *format, ArchiveMode *mode)
archiveFormat = archDirectory; archiveFormat = archDirectory;
else if (pg_strcasecmp(format, "directory") == 0) else if (pg_strcasecmp(format, "directory") == 0)
archiveFormat = archDirectory; archiveFormat = archDirectory;
else if (pg_strcasecmp(format, "f") == 0 || pg_strcasecmp(format, "file") == 0)
/*
* Dump files into the current directory; for demonstration only, not
* documented.
*/
archiveFormat = archFiles;
else if (pg_strcasecmp(format, "p") == 0) else if (pg_strcasecmp(format, "p") == 0)
archiveFormat = archNull; archiveFormat = archNull;
else if (pg_strcasecmp(format, "plain") == 0) else if (pg_strcasecmp(format, "plain") == 0)
......
...@@ -365,11 +365,6 @@ main(int argc, char **argv) ...@@ -365,11 +365,6 @@ main(int argc, char **argv)
opts->format = archDirectory; opts->format = archDirectory;
break; break;
case 'f':
case 'F':
opts->format = archFiles;
break;
case 't': case 't':
case 'T': case 'T':
opts->format = archTar; opts->format = archTar;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment