fix some gcc-ism's

kelvich · kelvich · commit 779927d9c1f3 · 2017-06-29T15:52:15.000+03:00
diff --git a/contrib/mmts/multimaster--1.0.sql b/contrib/mmts/multimaster--1.0.sql
@@ -103,7 +103,7 @@ CREATE FUNCTION mtm.referee_poll(xid bigint) RETURNS bigint
 AS 'MODULE_PATHNAME','mtm_referee_poll'
 LANGUAGE C;
 
-CREATE TABLE IF NOT EXISTS mtm.local_tables(rel_schema text, rel_name text, primary key(rel_schema, rel_name));
+CREATE TABLE IF NOT EXISTS mtm.local_tables(rel_schema name, rel_name name, primary key(rel_schema, rel_name));
 
 CREATE OR REPLACE FUNCTION mtm.alter_sequences() RETURNS boolean AS 
 $$
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -913,14 +913,15 @@ MtmResetTransaction()
 	x->gid[0] = '\0';
 }
 
-
+#if 0
 static const char* const isoLevelStr[] =
 {
 	"read uncommitted",
 	"read committed",
 	"repeatable read",
 	"serializable"
 };
+#endif
 
 bool MtmTransIsActive(void)
 {
@@ -2588,8 +2589,8 @@ void MtmMakeTableLocal(char const* schema, char const* name)
 
 
 typedef struct {
-	text schema;
-	text name;
+	NameData schema;
+	NameData name;
 } MtmLocalTablesTuple;
 
 static void MtmLoadLocalTables(void)
@@ -2609,7 +2610,7 @@ static void MtmLoadLocalTables(void)
 		while (HeapTupleIsValid(tuple = systable_getnext(scan)))
 		{
 			MtmLocalTablesTuple	*t = (MtmLocalTablesTuple*) GETSTRUCT(tuple);
-			MtmMakeTableLocal(text_to_cstring(&t->schema), text_to_cstring(&t->name));
+			MtmMakeTableLocal(NameStr(t->schema), NameStr(t->name));
 		}
 
 		systable_endscan(scan);

Original file line number	Diff line number	Diff line change
`@@ -913,14 +913,15 @@ MtmResetTransaction()`
`913`	`913`	`x->gid[0] = '\0';`
`914`	`914`	`}`
`915`	`915`
`916`		`-`
	`916`	`+#if 0`
`917`	`917`	`static const char* const isoLevelStr[] =`
`918`	`918`	`{`
`919`	`919`	`"read uncommitted",`
`920`	`920`	`"read committed",`
`921`	`921`	`"repeatable read",`
`922`	`922`	`"serializable"`
`923`	`923`	`};`
	`924`	`+#endif`
`924`	`925`
`925`	`926`	`bool MtmTransIsActive(void)`
`926`	`927`	`{`
`@@ -2588,8 +2589,8 @@ void MtmMakeTableLocal(char const* schema, char const* name)`
`2588`	`2589`
`2589`	`2590`
`2590`	`2591`	`typedef struct {`
`2591`		`- text schema;`
`2592`		`- text name;`
	`2592`	`+ NameData schema;`
	`2593`	`+ NameData name;`
`2593`	`2594`	`} MtmLocalTablesTuple;`
`2594`	`2595`
`2595`	`2596`	`static void MtmLoadLocalTables(void)`
`@@ -2609,7 +2610,7 @@ static void MtmLoadLocalTables(void)`
`2609`	`2610`	`while (HeapTupleIsValid(tuple = systable_getnext(scan)))`
`2610`	`2611`	`{`
`2611`	`2612`	`MtmLocalTablesTuple t = (MtmLocalTablesTuple) GETSTRUCT(tuple);`
`2612`		`- MtmMakeTableLocal(text_to_cstring(&t->schema), text_to_cstring(&t->name));`
	`2613`	`+ MtmMakeTableLocal(NameStr(t->schema), NameStr(t->name));`
`2613`	`2614`	`}`
`2614`	`2615`
`2615`	`2616`	`systable_endscan(scan);`