summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian2006-07-18 17:42:01 +0000
committerBruce Momjian2006-07-18 17:42:01 +0000
commit7abfa35ed7d1d54055a886c8bf8ef119eaea843b (patch)
tree45d2da2c9e0b91a0f0207e2d4d99c1d0845809c8
parent4dac5cee9b13e1ddcb137d879b8984df2eafe14e (diff)
Mark a few functions as static or NOT_USED.
-rw-r--r--src/backend/commands/opclasscmds.c2
-rw-r--r--src/backend/rewrite/rewriteDefine.c2
-rw-r--r--src/bin/pg_dump/pg_backup_archiver.c8
-rw-r--r--src/bin/pg_dump/pg_backup_archiver.h3
-rw-r--r--src/bin/pg_dump/pg_backup_db.c2
-rw-r--r--src/bin/pg_dump/pg_backup_db.h1
-rw-r--r--src/bin/psql/command.c4
-rw-r--r--src/bin/psql/command.h2
-rw-r--r--src/include/commands/defrem.h1
9 files changed, 13 insertions, 12 deletions
diff --git a/src/backend/commands/opclasscmds.c b/src/backend/commands/opclasscmds.c
index 3ebc5bc88d..6102a531e0 100644
--- a/src/backend/commands/opclasscmds.c
+++ b/src/backend/commands/opclasscmds.c
@@ -924,6 +924,7 @@ RenameOpClass(List *name, const char *access_method, const char *newname)
/*
* Change opclass owner by oid
*/
+#ifdef NOT_USED
void
AlterOpClassOwner_oid(Oid opcOid, Oid newOwnerId)
{
@@ -943,6 +944,7 @@ AlterOpClassOwner_oid(Oid opcOid, Oid newOwnerId)
heap_freetuple(tup);
heap_close(rel, NoLock);
}
+#endif
/*
* Change opclass owner by name
diff --git a/src/backend/rewrite/rewriteDefine.c b/src/backend/rewrite/rewriteDefine.c
index f67420fa49..a47cd4b1cc 100644
--- a/src/backend/rewrite/rewriteDefine.c
+++ b/src/backend/rewrite/rewriteDefine.c
@@ -552,6 +552,7 @@ setRuleCheckAsUser_walker(Node *node, Oid *context)
*
* This is unused code at the moment.
*/
+#ifdef NOT_USED
void
RenameRewriteRule(Oid owningRel, const char *oldName,
const char *newName)
@@ -588,3 +589,4 @@ RenameRewriteRule(Oid owningRel, const char *oldName,
heap_freetuple(ruletup);
heap_close(pg_rewrite_desc, RowExclusiveLock);
}
+#endif
diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index a5250841e1..c8c7074e56 100644
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -69,6 +69,8 @@ static void _write_msg(const char *modulename, const char *fmt, va_list ap);
static void _die_horribly(ArchiveHandle *AH, const char *modulename, const char *fmt, va_list ap);
static void dumpTimestamp(ArchiveHandle *AH, const char *msg, time_t tim);
+static OutputContext SetOutput(ArchiveHandle *AH, char *filename, int compression);
+static void ResetOutput(ArchiveHandle *AH, OutputContext savedContext);
/*
@@ -860,7 +862,7 @@ archprintf(Archive *AH, const char *fmt,...)
* Stuff below here should be 'private' to the archiver routines
*******************************/
-OutputContext
+static OutputContext
SetOutput(ArchiveHandle *AH, char *filename, int compression)
{
OutputContext sav;
@@ -912,7 +914,7 @@ SetOutput(ArchiveHandle *AH, char *filename, int compression)
return sav;
}
-void
+static void
ResetOutput(ArchiveHandle *AH, OutputContext sav)
{
int res;
@@ -985,7 +987,7 @@ ahlog(ArchiveHandle *AH, int level, const char *fmt,...)
/*
* Single place for logic which says 'We are restoring to a direct DB connection'.
*/
-int
+static int
RestoringToDB(ArchiveHandle *AH)
{
return (AH->ropt && AH->ropt->useDB && AH->connection);
diff --git a/src/bin/pg_dump/pg_backup_archiver.h b/src/bin/pg_dump/pg_backup_archiver.h
index 60ff90898d..be8d9636a8 100644
--- a/src/bin/pg_dump/pg_backup_archiver.h
+++ b/src/bin/pg_dump/pg_backup_archiver.h
@@ -353,9 +353,6 @@ extern void InitArchiveFmt_Tar(ArchiveHandle *AH);
extern bool isValidTarHeader(char *header);
-extern OutputContext SetOutput(ArchiveHandle *AH, char *filename, int compression);
-extern void ResetOutput(ArchiveHandle *AH, OutputContext savedContext);
-extern int RestoringToDB(ArchiveHandle *AH);
extern int ReconnectToServer(ArchiveHandle *AH, const char *dbname, const char *newUser);
int ahwrite(const void *ptr, size_t size, size_t nmemb, ArchiveHandle *AH);
diff --git a/src/bin/pg_dump/pg_backup_db.c b/src/bin/pg_dump/pg_backup_db.c
index 98167269d0..3c81e1c69e 100644
--- a/src/bin/pg_dump/pg_backup_db.c
+++ b/src/bin/pg_dump/pg_backup_db.c
@@ -283,7 +283,7 @@ notice_processor(void *arg, const char *message)
/* Public interface */
/* Convenience function to send a query. Monitors result to handle COPY statements */
-int
+static int
ExecuteSqlCommand(ArchiveHandle *AH, PQExpBuffer qry, char *desc)
{
PGconn *conn = AH->connection;
diff --git a/src/bin/pg_dump/pg_backup_db.h b/src/bin/pg_dump/pg_backup_db.h
index 9a2e2119c8..f3f41d99ca 100644
--- a/src/bin/pg_dump/pg_backup_db.h
+++ b/src/bin/pg_dump/pg_backup_db.h
@@ -10,7 +10,6 @@
#include "pg_backup_archiver.h"
-extern int ExecuteSqlCommand(ArchiveHandle *AH, PQExpBuffer qry, char *desc);
extern int ExecuteSqlCommandBuf(ArchiveHandle *AH, void *qry, size_t bufLen);
extern void StartTransaction(ArchiveHandle *AH);
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index c6cfbeb501..ea1363cd97 100644
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -55,6 +55,8 @@ static backslashResult exec_command(const char *cmd,
static bool do_edit(const char *filename_arg, PQExpBuffer query_buf);
static bool do_connect(char *dbname, char *user, char *host, char *port);
static bool do_shell(const char *command);
+static void SyncVerbosityVariable(void);
+
/*----------
@@ -1175,7 +1177,7 @@ UnsyncVariables(void)
/*
* Update connection state from VERBOSITY variable
*/
-void
+static void
SyncVerbosityVariable(void)
{
switch (SwitchVariable(pset.vars, "VERBOSITY",
diff --git a/src/bin/psql/command.h b/src/bin/psql/command.h
index 7c056e4e6a..1389acae41 100644
--- a/src/bin/psql/command.h
+++ b/src/bin/psql/command.h
@@ -38,6 +38,4 @@ extern void SyncVariables(void);
extern void UnsyncVariables(void);
-extern void SyncVerbosityVariable(void);
-
#endif /* COMMAND_H */
diff --git a/src/include/commands/defrem.h b/src/include/commands/defrem.h
index 32bd7d9a41..aa0143b35e 100644
--- a/src/include/commands/defrem.h
+++ b/src/include/commands/defrem.h
@@ -82,7 +82,6 @@ extern void RemoveOpClass(RemoveOpClassStmt *stmt);
extern void RemoveOpClassById(Oid opclassOid);
extern void RenameOpClass(List *name, const char *access_method, const char *newname);
extern void AlterOpClassOwner(List *name, const char *access_method, Oid newOwnerId);
-extern void AlterOpClassOwner_oid(Oid opcOid, Oid newOwnerId);
/* support routines in commands/define.c */