Move tar function headers to pgtar.h

This makes it possible to include them only where they are used, so
we can avoid the conflict of the uid_t and gid_t datatypes that happened
in plperl (since plperl doesn't need the tar functions)

diff --git a/src/backend/replication/basebackup.c b/src/backend/replication/basebackup.c
index 81933ddc188c284db53ccb517974f89947ae50ff..0e50ed169ebc1028c00cc75f8ff97c2d51896d43 100644 (file)
--- a/src/backend/replication/basebackup.c
+++ b/src/backend/replication/basebackup.c
@@ -32,6 +32,7 @@
 #include "utils/builtins.h"
 #include "utils/elog.h"
 #include "utils/ps_status.h"
+#include "pgtar.h"
 
 typedef struct
 {

diff --git a/src/bin/pg_dump/pg_backup_tar.c b/src/bin/pg_dump/pg_backup_tar.c
index a60492bcb76cac80c92717b5f95b134115da7861..5e560709765eaf4fb14b03ce0a8d7cb32428da05 100644 (file)
--- a/src/bin/pg_dump/pg_backup_tar.c
+++ b/src/bin/pg_dump/pg_backup_tar.c
@@ -30,6 +30,7 @@
 #include "pg_backup_tar.h"
 #include "dumpmem.h"
 #include "dumputils.h"
+#include "pgtar.h"
 
 #include <sys/stat.h>
 #include <ctype.h>

diff --git a/src/include/pgtar.h b/src/include/pgtar.h
new file mode 100644 (file)
index 0000000..ec8f681
--- /dev/null
+++ b/src/include/pgtar.h
@@ -0,0 +1,15 @@
+/*-------------------------------------------------------------------------
+ *
+ * pgtar.h
+ *       Functions for manipulating tarfile datastructures (src/port/tar.c)
+ *
+ *
+ * Portions Copyright (c) 1996-2013, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * src/include/pgtar.h
+ *
+ *-------------------------------------------------------------------------
+ */
+extern void tarCreateHeader(char *h, const char *filename, const char *linktarget, size_t size, mode_t mode, uid_t uid, gid_t gid, time_t mtime);
+extern int     tarChecksum(char *header);

diff --git a/src/include/port.h b/src/include/port.h
index 6085cd2bb7acd0df76b83cbd66f2def7296c18b3..b6092c6fda8ceba325bbcb9df7ecf1ac4036c315 100644 (file)
--- a/src/include/port.h
+++ b/src/include/port.h
@@ -465,8 +465,4 @@ extern int  pg_check_dir(const char *dir);
 /* port/pgmkdirp.c */
 extern int     pg_mkdir_p(char *path, int omode);
 
-/* port/tar.c */
-void           tarCreateHeader(char *h, const char *filename, const char *linktarget, size_t size, mode_t mode, uid_t uid, gid_t gid, time_t mtime);
-int                    tarChecksum(char *header);
-
 #endif   /* PG_PORT_H */

diff --git a/src/port/tar.c b/src/port/tar.c
index 54ef41afd73955449bfe1941fa62407d8894dbe1..33b488464f2782df4633f37d3cfa9d17f6e0c8bb 100644 (file)
--- a/src/port/tar.c
+++ b/src/port/tar.c
@@ -1,4 +1,5 @@
 #include "c.h"
+#include "pgtar.h"
 #include <sys/stat.h>
 
 /*