NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit7d717f2

committed

Rename static variables to avoid possible name conflicts on systems with

dirty standard headers (eg AIX).

1 parent40296aa commit7d717f2Copy full SHA for 7d717f2

File tree

1 file changed

+11

-11

lines changed

src/bin/pg_dump
- common.c

1 file changed

+11

-11

lines changed

`‎src/bin/pg_dump/common.c`

Lines changed: 11 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $PostgreSQL: pgsql/src/bin/pg_dump/common.c,v 1.81 2004/03/03 21:28:54 tgl Exp $`
	`14`	`+ * $PostgreSQL: pgsql/src/bin/pg_dump/common.c,v 1.82 2004/05/20 17:13:52 tgl Exp $`
`15`	`15`	`*`
`16`	`16`	`*-------------------------------------------------------------------------`
`17`	`17`	`*/`
`@@ -50,8 +50,8 @@ static intnumCatalogIds = 0;`
`50`	`50`	`* them into findTableByOid() and friends.`
`51`	`51`	`*/`
`52`	`52`	`staticTableInfo*tblinfo;`
`53`		`-staticTypeInfo*tinfo;`
`54`		`-staticFuncInfo*finfo;`
	`53`	`+staticTypeInfo*typinfo;`
	`54`	`+staticFuncInfo*funinfo;`
`55`	`55`	`staticOprInfo*oprinfo;`
`56`	`56`	`staticintnumTables;`
`57`	`57`	`staticintnumTypes;`
`@@ -101,12 +101,12 @@ getSchemaData(int *numTablesPtr,`
`101`	`101`
`102`	`102`	`if (g_verbose)`
`103`	`103`	`write_msg(NULL,"reading user-defined functions\n");`
`104`		`-finfo=getFuncs(&numFuncs);`
	`104`	`+funinfo=getFuncs(&numFuncs);`
`105`	`105`
`106`	`106`	`/* this must be after getFuncs */`
`107`	`107`	`if (g_verbose)`
`108`	`108`	`write_msg(NULL,"reading user-defined types\n");`
`109`		`-tinfo=getTypes(&numTypes);`
	`109`	`+typinfo=getTypes(&numTypes);`
`110`	`110`
`111`	`111`	`/* this must be after getFuncs, too */`
`112`	`112`	`if (g_verbose)`
`@@ -631,7 +631,7 @@ findTableByOid(Oid oid)`
`631`	`631`
`632`	`632`	`/*`
`633`	`633`	`* findTypeByOid`
`634`		`- * finds the entry (intinfo) of the type with the given oid`
	`634`	`+ * finds the entry (intypinfo) of the type with the given oid`
`635`	`635`	`* returns NULL if not found`
`636`	`636`	`*`
`637`	`637`	`* NOTE: should hash this, but just do linear search for now`
`@@ -643,15 +643,15 @@ findTypeByOid(Oid oid)`
`643`	`643`
`644`	`644`	`for (i=0;i<numTypes;i++)`
`645`	`645`	`{`
`646`		`-if (tinfo[i].dobj.catId.oid==oid)`
`647`		`-return&tinfo[i];`
	`646`	`+if (typinfo[i].dobj.catId.oid==oid)`
	`647`	`+return&typinfo[i];`
`648`	`648`	`}`
`649`	`649`	`returnNULL;`
`650`	`650`	`}`
`651`	`651`
`652`	`652`	`/*`
`653`	`653`	`* findFuncByOid`
`654`		`- * finds the entry (infinfo) of the function with the given oid`
	`654`	`+ * finds the entry (infuninfo) of the function with the given oid`
`655`	`655`	`* returns NULL if not found`
`656`	`656`	`*`
`657`	`657`	`* NOTE: should hash this, but just do linear search for now`
`@@ -663,8 +663,8 @@ findFuncByOid(Oid oid)`
`663`	`663`
`664`	`664`	`for (i=0;i<numFuncs;i++)`
`665`	`665`	`{`
`666`		`-if (finfo[i].dobj.catId.oid==oid)`
`667`		`-return&finfo[i];`
	`666`	`+if (funinfo[i].dobj.catId.oid==oid)`
	`667`	`+return&funinfo[i];`
`668`	`668`	`}`
`669`	`669`	`returnNULL;`
`670`	`670`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit7d717f2

File tree

1 file changed

1 file changed

`‎src/bin/pg_dump/common.c`

0 commit comments