From 043cebce2b3df39b3939a55778b66f240159ec5d Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 21 Nov 1997 19:02:59 +0000
Subject: [PATCH] More archive cleanup.

---
 src/backend/storage/large_object/inv_api.c | 13 ++-----------
 src/backend/tcop/utility.c                 |  3 +--
 src/bin/pg_dump/common.c                   | 13 +------------
 src/include/libpq/libpq-fs.h               |  4 +---
 4 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c
index 6483843e71f..1575da83c31 100644
--- a/src/backend/storage/large_object/inv_api.c
+++ b/src/backend/storage/large_object/inv_api.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.21 1997/11/21 18:11:12 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.22 1997/11/21 19:02:37 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -79,7 +79,7 @@ static int	_inv_getsize(Relation hreln, TupleDesc hdesc, Relation ireln);
  *	inv_create -- create a new large object.
  *
  *		Arguments:
- *		  flags -- storage manager to use, archive mode, etc.
+ *		  flags -- was archive, smgr
  *
  *		Returns:
  *		  large object descriptor, appropriately filled in.
@@ -91,21 +91,12 @@ inv_create(int flags)
 	LargeObjectDesc *retval;
 	Relation	r;
 	Relation	indr;
-	int			smgr;
-	char		archchar;
 	TupleDesc	tupdesc;
 	AttrNumber	attNums[1];
 	Oid			classObjectId[1];
 	char		objname[NAMEDATALEN];
 	char		indname[NAMEDATALEN];
 
-	/* parse flags */
-	smgr = flags & INV_SMGRMASK;
-	if (flags & INV_ARCHIVE)
-		archchar = 'h';
-	else
-		archchar = 'n';
-
 	/*
 	 * add one here since the pg_class tuple created will have the next
 	 * oid and we want to have the relation name to correspond to the
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index ffb17b39b15..0ce74f31e5e 100644
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.29 1997/11/21 18:11:16 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.30 1997/11/21 19:02:42 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -391,7 +391,6 @@ ProcessUtility(Node * parsetree,
 
 				commandTag = "CREATE";
 				CHECK_IF_ABORTED();
-				/* XXX no support for ARCHIVE indices, yet */
 				DefineIndex(stmt->relname,		/* relation name */
 							stmt->idxname,		/* index name */
 							stmt->accessMethod, /* am name */
diff --git a/src/bin/pg_dump/common.c b/src/bin/pg_dump/common.c
index 5f4dc96a8e2..e4a17d3654c 100644
--- a/src/bin/pg_dump/common.c
+++ b/src/bin/pg_dump/common.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.18 1997/10/30 16:47:57 thomas Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.19 1997/11/21 19:02:50 momjian Exp $
  *
  * Modifications - 6/12/96 - dave@bensoft.com - version 1.13.dhb.2
  *
@@ -469,17 +469,6 @@ findFuncByName(FuncInfo *finfo, int numFuncs, const char *name)
 	return -1;
 }
 
-/*
- * isArchiveName
- *
- *	 returns true if the relation name is an archive name, false otherwise
- */
-int
-isArchiveName(const char *relname)
-{
-	return (strlen(relname) > 1 && relname[1] == ',');
-}
-
 /*
  * fmtId
  *
diff --git a/src/include/libpq/libpq-fs.h b/src/include/libpq/libpq-fs.h
index ffa20f634d9..affc01777b7 100644
--- a/src/include/libpq/libpq-fs.h
+++ b/src/include/libpq/libpq-fs.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: libpq-fs.h,v 1.5 1997/09/08 02:37:07 momjian Exp $
+ * $Id: libpq-fs.h,v 1.6 1997/11/21 19:02:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -88,8 +88,6 @@ struct pgdirent
  *	manager to be used, and the high sixteen bits for flags.
  */
 
-#define INV_SMGRMASK	0x0000ffff
-#define INV_ARCHIVE		0x00010000
 #define INV_WRITE		0x00020000
 #define INV_READ		0x00040000