Turns out OIDNAMELEN wasn't really being used at all!

tglsfdc · tglsfdc · commit 1c3c08053452 · 1999-06-04T21:12:07.000Z
Get rid of it to make customization of NAMEDATALEN easier.
diff --git a/src/backend/catalog/genbki.sh.in b/src/backend/catalog/genbki.sh.in
@@ -10,7 +10,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/catalog/Attic/genbki.sh.in,v 1.2 1998/10/28 19:38:46 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/catalog/Attic/genbki.sh.in,v 1.3 1999/06/04 21:12:06 tgl Exp $
 #
 # NOTES
 #    non-essential whitespace is removed from the generated file.
@@ -52,9 +52,8 @@ while test $x -le $numargs ; do
     shift
 done
 
-# Get NAMEDATALEN and OIDNAMELEN from postgres_ext.h
+# Get NAMEDATALEN from postgres_ext.h
 NAMEDATALEN=`grep '#define.*NAMEDATALEN' ../../include/postgres_ext.h | awk '{ print $3 }'`
-OIDNAMELEN=`grep '#define.*OIDNAMELEN' ../../include/postgres_ext.h | awk '{ print $3 }'`
 
 # ----------------
 # 	strip comments and trash from .h before we generate
@@ -80,9 +79,8 @@ sed -e "s/;[ 	]*$//g" \
     -e "s/^NameData/\name/g" \
     -e "s/(NameData/(name/g" \
     -e "s/(Oid/(oid/g" \
-	-e "s/NAMEDATALEN/$NAMEDATALEN/g" \
-	-e "s/OIDNAMELEN/$OIDNAMELEN/g" | \
-awk '
+    -e "s/NAMEDATALEN/$NAMEDATALEN/g" \
+| awk '
 # ----------------
 #	now use awk to process remaining .h file..
 #
diff --git a/src/bin/initlocation/Makefile b/src/bin/initlocation/Makefile
@@ -7,17 +7,13 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/initlocation/Attic/Makefile,v 1.6 1998/08/22 05:19:25 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/initlocation/Attic/Makefile,v 1.7 1999/06/04 21:12:06 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
 SRCDIR= ../..
 include ../../Makefile.global
 
-SEDSCRIPT= \
-    -e "s^PG_OPT_NAMEDATALEN_PARAM^$(NAMEDATALEN)^g" \
-    -e "s^PG_OPT_OIDNAMELEN_PARAM^$(OIDNAMELEN)^g" 
-
 all: initlocation
 
 initlocation: initlocation.sh
diff --git a/src/include/postgres_ext.h b/src/include/postgres_ext.h
@@ -16,7 +16,7 @@
  *	use header files that are otherwise internal to Postgres to interface
  *	with the backend.
  *
- * $Id: postgres_ext.h,v 1.3 1999/02/13 23:20:47 momjian Exp $
+ * $Id: postgres_ext.h,v 1.4 1999/06/04 21:12:07 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -33,7 +33,4 @@ typedef unsigned int Oid;
  */
 #define NAMEDATALEN 32
 
-/* OIDNAMELEN should be set to NAMEDATALEN + sizeof(Oid) */
-#define OIDNAMELEN	36
-
 #endif

Original file line number	Diff line number	Diff line change
`@@ -7,17 +7,13 @@`
`7`	`7`	`#`
`8`	`8`	`#`
`9`	`9`	`# IDENTIFICATION`
`10`		`-# $Header: /cvsroot/pgsql/src/bin/initlocation/Attic/Makefile,v 1.6 1998/08/22 05:19:25 momjian Exp $`
	`10`	`+# $Header: /cvsroot/pgsql/src/bin/initlocation/Attic/Makefile,v 1.7 1999/06/04 21:12:06 tgl Exp $`
`11`	`11`	`#`
`12`	`12`	`#-------------------------------------------------------------------------`
`13`	`13`
`14`	`14`	`SRCDIR= ../..`
`15`	`15`	`include ../../Makefile.global`
`16`	`16`
`17`		`-SEDSCRIPT= \`
`18`		`- -e "s^PG_OPT_NAMEDATALEN_PARAM^$(NAMEDATALEN)^g" \`
`19`		`- -e "s^PG_OPT_OIDNAMELEN_PARAM^$(OIDNAMELEN)^g"`
`20`		`-`
`21`	`17`	`all: initlocation`
`22`	`18`
`23`	`19`	`initlocation: initlocation.sh`