NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit58e7972

committed

Rename typedef "string" to "VarString".

Since pgindent treats typedef names as global, the original coding ofb47b4db would have had rather nasty effects on the formattingof other files in which "string" is used as a variable or field name.Use a less generic name for this typedef, and rename some otheridentifiers to match.Peter Geoghegan, per gripe from me

1 parent6382896 commit58e7972Copy full SHA for 58e7972

File tree

1 file changed

+16

-16

lines changed

src/backend/utils/adt
- varlena.c

1 file changed

+16

-16

lines changed

`‎src/backend/utils/adt/varlena.c`

Lines changed: 16 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@`
`40`	`40`	`intbytea_output=BYTEA_OUTPUT_HEX;`
`41`	`41`
`42`	`42`	`typedefstructvarlenaunknown;`
`43`		`-typedefstructvarlenastring;`
	`43`	`+typedefstructvarlenaVarString;`
`44`	`44`
`45`	`45`	`typedefstruct`
`46`	`46`	`{`
`@@ -75,7 +75,7 @@ typedef struct`
`75`	`75`	`#ifdefHAVE_LOCALE_T`
`76`	`76`	`pg_locale_tlocale;`
`77`	`77`	`#endif`
`78`		`-}StringSortSupport;`
	`78`	`+}VarStringSortSupport;`
`79`	`79`
`80`	`80`	`/*`
`81`	`81`	`* This should be large enough that most strings will fit, but small enough`
`@@ -89,8 +89,8 @@ typedef struct`
`89`	`89`	`#definePG_GETARG_UNKNOWN_P_COPY(n) DatumGetUnknownPCopy(PG_GETARG_DATUM(n))`
`90`	`90`	`#definePG_RETURN_UNKNOWN_P(x)PG_RETURN_POINTER(x)`
`91`	`91`
`92`		`-#defineDatumGetStringP(X)((string *) PG_DETOAST_DATUM(X))`
`93`		`-#defineDatumGetStringPP(X)((string *) PG_DETOAST_DATUM_PACKED(X))`
	`92`	`+#defineDatumGetVarStringP(X)((VarString *) PG_DETOAST_DATUM(X))`
	`93`	`+#defineDatumGetVarStringPP(X)((VarString *) PG_DETOAST_DATUM_PACKED(X))`
`94`	`94`
`95`	`95`	`staticintvarstrfastcmp_c(Datumx,Datumy,SortSupportssup);`
`96`	`96`	`staticintbpcharfastcmp_c(Datumx,Datumy,SortSupportssup);`
`@@ -1766,7 +1766,7 @@ varstr_sortsupport(SortSupport ssup, Oid collid, bool bpchar)`
`1766`	`1766`	`{`
`1767`	`1767`	`boolabbreviate=ssup->abbreviate;`
`1768`	`1768`	`boolcollate_c= false;`
`1769`		`-StringSortSupport*sss;`
	`1769`	`+VarStringSortSupport*sss;`
`1770`	`1770`
`1771`	`1771`	`#ifdefHAVE_LOCALE_T`
`1772`	`1772`	`pg_locale_tlocale=0;`
`@@ -1853,7 +1853,7 @@ varstr_sortsupport(SortSupport ssup, Oid collid, bool bpchar)`
`1853`	`1853`	`*/`
`1854`	`1854`	`if (abbreviate\|\| !collate_c)`
`1855`	`1855`	`{`
`1856`		`-sss=palloc(sizeof(StringSortSupport));`
	`1856`	`+sss=palloc(sizeof(VarStringSortSupport));`
`1857`	`1857`	`sss->buf1=palloc(TEXTBUFLEN);`
`1858`	`1858`	`sss->buflen1=TEXTBUFLEN;`
`1859`	`1859`	`sss->buf2=palloc(TEXTBUFLEN);`
`@@ -1909,8 +1909,8 @@ varstr_sortsupport(SortSupport ssup, Oid collid, bool bpchar)`
`1909`	`1909`	`staticint`
`1910`	`1910`	`varstrfastcmp_c(Datumx,Datumy,SortSupportssup)`
`1911`	`1911`	`{`
`1912`		`-string*arg1=DatumGetStringPP(x);`
`1913`		`-string*arg2=DatumGetStringPP(y);`
	`1912`	`+VarString*arg1=DatumGetVarStringPP(x);`
	`1913`	`+VarString*arg2=DatumGetVarStringPP(y);`
`1914`	`1914`	`char*a1p,`
`1915`	`1915`	`*a2p;`
`1916`	`1916`	`intlen1,`
`@@ -1979,10 +1979,10 @@ bpcharfastcmp_c(Datum x, Datum y, SortSupport ssup)`
`1979`	`1979`	`staticint`
`1980`	`1980`	`varstrfastcmp_locale(Datumx,Datumy,SortSupportssup)`
`1981`	`1981`	`{`
`1982`		`-string*arg1=DatumGetStringPP(x);`
`1983`		`-string*arg2=DatumGetStringPP(y);`
`1984`		`-boolarg1_match;`
`1985`		`-StringSortSupportsss= (StringSortSupport)ssup->ssup_extra;`
	`1982`	`+VarString*arg1=DatumGetVarStringPP(x);`
	`1983`	`+VarString*arg2=DatumGetVarStringPP(y);`
	`1984`	`+boolarg1_match;`
	`1985`	`+VarStringSortSupportsss= (VarStringSortSupport)ssup->ssup_extra;`
`1986`	`1986`
`1987`	`1987`	`/* working state */`
`1988`	`1988`	`char*a1p,`
`@@ -2134,9 +2134,9 @@ varstrcmp_abbrev(Datum x, Datum y, SortSupport ssup)`
`2134`	`2134`	`staticDatum`
`2135`	`2135`	`varstr_abbrev_convert(Datumoriginal,SortSupportssup)`
`2136`	`2136`	`{`
`2137`		`-StringSortSupportsss= (StringSortSupport)ssup->ssup_extra;`
`2138`		`-string*authoritative=DatumGetStringPP(original);`
`2139`		`-char*authoritative_data=VARDATA_ANY(authoritative);`
	`2137`	`+VarStringSortSupportsss= (VarStringSortSupport)ssup->ssup_extra;`
	`2138`	`+VarString*authoritative=DatumGetVarStringPP(original);`
	`2139`	`+char*authoritative_data=VARDATA_ANY(authoritative);`
`2140`	`2140`
`2141`	`2141`	`/* working state */`
`2142`	`2142`	`Datumres;`
`@@ -2311,7 +2311,7 @@ varstr_abbrev_convert(Datum original, SortSupport ssup)`
`2311`	`2311`	`staticbool`
`2312`	`2312`	`varstr_abbrev_abort(intmemtupcount,SortSupportssup)`
`2313`	`2313`	`{`
`2314`		`-StringSortSupportsss= (StringSortSupport)ssup->ssup_extra;`
	`2314`	`+VarStringSortSupportsss= (VarStringSortSupport)ssup->ssup_extra;`
`2315`	`2315`	`doubleabbrev_distinct,`
`2316`	`2316`	`key_distinct;`
`2317`	`2317`

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!

Commit58e7972

File tree

1 file changed

1 file changed

`‎src/backend/utils/adt/varlena.c`

0 commit comments