Commit1c3c080

committed

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

Get rid of it to make customization of NAMEDATALEN easier.

1 parent7b5f84d commit1c3c080Copy full SHA for 1c3c080

File tree

-15

lines changed

-15

lines changed

Lines changed: 4 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`#`
`11`	`11`	`#`
`12`	`12`	`# IDENTIFICATION`
`13`		`-# $Header: /cvsroot/pgsql/src/backend/catalog/Attic/genbki.sh.in,v 1.2 1998/10/28 19:38:46 tgl Exp $`
	`13`	`+# $Header: /cvsroot/pgsql/src/backend/catalog/Attic/genbki.sh.in,v 1.3 1999/06/04 21:12:06 tgl Exp $`
`14`	`14`	`#`
`15`	`15`	`# NOTES`
`16`	`16`	`# non-essential whitespace is removed from the generated file.`
`@@ -52,9 +52,8 @@ while test $x -le $numargs ; do`
`52`	`52`	`shift`
`53`	`53`	`done`
`54`	`54`
`55`		`-# Get NAMEDATALENand OIDNAMELENfrom postgres_ext.h`
	`55`	`+# Get NAMEDATALEN from postgres_ext.h`
`56`	`56`	NAMEDATALEN=`grep'#define.*NAMEDATALEN' ../../include/postgres_ext.h\| awk'{ print $3 }'`
`57`		-OIDNAMELEN=`grep'#define.*OIDNAMELEN' ../../include/postgres_ext.h\| awk'{ print $3 }'`
`58`	`57`
`59`	`58`	`# ----------------`
`60`	`59`	`# strip comments and trash from .h before we generate`
`@@ -80,9 +79,8 @@ sed -e "s/;[ ]*$//g" \`
`80`	`79`	`-e"s/^NameData/\name/g" \`
`81`	`80`	`-e"s/(NameData/(name/g" \`
`82`	`81`	`-e"s/(Oid/(oid/g" \`
`83`		`--e"s/NAMEDATALEN/$NAMEDATALEN/g" \`
`84`		`--e"s/OIDNAMELEN/$OIDNAMELEN/g"\| \`
`85`		`-awk'`
	`82`	`+ -e"s/NAMEDATALEN/$NAMEDATALEN/g" \`
	`83`	`+\| awk'`
`86`	`84`	`# ----------------`
`87`	`85`	`#now use awk to process remaining .h file..`
`88`	`86`	`#`

Lines changed: 1 addition & 5 deletions

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`

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`*use header files that are otherwise internal to Postgres to interface`
`17`	`17`	`*with the backend.`
`18`	`18`	`*`
`19`		`- * $Id: postgres_ext.h,v 1.3 1999/02/13 23:20:47 momjian Exp $`
	`19`	`+ * $Id: postgres_ext.h,v 1.4 1999/06/04 21:12:07 tgl Exp $`
`20`	`20`	`*`
`21`	`21`	`*-------------------------------------------------------------------------`
`22`	`22`	`*/`
`@@ -33,7 +33,4 @@ typedef unsigned int Oid;`
`33`	`33`	`*/`
`34`	`34`	`#defineNAMEDATALEN 32`
`35`	`35`
`36`		`-/* OIDNAMELEN should be set to NAMEDATALEN + sizeof(Oid) */`
`37`		`-#defineOIDNAMELEN36`
`38`		`-`
`39`	`36`	`#endif`

Comments

(0)