mirror of
				https://github.com/postgres/postgres.git
				synced 2025-10-28 11:55:03 +03:00 
			
		
		
		
	Turns out OIDNAMELEN wasn't really being used at all!
Get rid of it to make customization of NAMEDATALEN easier.
This commit is contained in:
		| @@ -10,7 +10,7 @@ | |||||||
| # | # | ||||||
| # | # | ||||||
| # IDENTIFICATION | # 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 | # NOTES | ||||||
| #    non-essential whitespace is removed from the generated file. | #    non-essential whitespace is removed from the generated file. | ||||||
| @@ -52,9 +52,8 @@ while test $x -le $numargs ; do | |||||||
|     shift |     shift | ||||||
| done | 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 }'` | 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 | # 	strip comments and trash from .h before we generate | ||||||
| @@ -81,8 +80,7 @@ sed -e "s/;[ 	]*$//g" \ | |||||||
|     -e "s/(NameData/(name/g" \ |     -e "s/(NameData/(name/g" \ | ||||||
|     -e "s/(Oid/(oid/g" \ |     -e "s/(Oid/(oid/g" \ | ||||||
|     -e "s/NAMEDATALEN/$NAMEDATALEN/g" \ |     -e "s/NAMEDATALEN/$NAMEDATALEN/g" \ | ||||||
| 	-e "s/OIDNAMELEN/$OIDNAMELEN/g" | \ | | awk ' | ||||||
| awk ' |  | ||||||
| # ---------------- | # ---------------- | ||||||
| #	now use awk to process remaining .h file.. | #	now use awk to process remaining .h file.. | ||||||
| # | # | ||||||
|   | |||||||
| @@ -7,17 +7,13 @@ | |||||||
| # | # | ||||||
| # | # | ||||||
| # IDENTIFICATION | # 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= ../.. | SRCDIR= ../.. | ||||||
| include ../../Makefile.global | include ../../Makefile.global | ||||||
|  |  | ||||||
| SEDSCRIPT= \ |  | ||||||
|     -e "s^PG_OPT_NAMEDATALEN_PARAM^$(NAMEDATALEN)^g" \ |  | ||||||
|     -e "s^PG_OPT_OIDNAMELEN_PARAM^$(OIDNAMELEN)^g"  |  | ||||||
|  |  | ||||||
| all: initlocation | all: initlocation | ||||||
|  |  | ||||||
| initlocation: initlocation.sh | initlocation: initlocation.sh | ||||||
|   | |||||||
| @@ -16,7 +16,7 @@ | |||||||
|  *	use header files that are otherwise internal to Postgres to interface |  *	use header files that are otherwise internal to Postgres to interface | ||||||
|  *	with the backend. |  *	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 | #define NAMEDATALEN 32 | ||||||
|  |  | ||||||
| /* OIDNAMELEN should be set to NAMEDATALEN + sizeof(Oid) */ |  | ||||||
| #define OIDNAMELEN	36 |  | ||||||
|  |  | ||||||
| #endif | #endif | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user