NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit5db55c6

committed

Remove wchar.c Asserts that were stricter than the main code

Assert errors were thrown for functions being passed invalid encodings,while the main code handled it just fine.Also document that libpq's PQclientEncoding() returns -1 for an encodinglookup failure.Per report from Peter Geoghegan

1 parent0b5c0f3 commit5db55c6Copy full SHA for 5db55c6

File tree

2 files changed

-15

lines changed

doc/src/sgml
- libpq.sgml
src/backend/utils/mb
- wchar.c

2 files changed

-15

lines changed

`‎doc/src/sgml/libpq.sgml`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5377,7 +5377,8 @@ int PQclientEncoding(const PGconn *<replaceable>conn</replaceable>);`
`5377`	`5377`	`</synopsis>`
`5378`	`5378`
`5379`	`5379`	`Note that it returns the encoding ID, not a symbolic string`
`5380`		`- such as <literal>EUC_JP</literal>. To convert an encoding ID to an encoding name, you`
	`5380`	`+ such as <literal>EUC_JP</literal>. If unsuccessful, it returns -1.`
	`5381`	`+ To convert an encoding ID to an encoding name, you`
`5381`	`5382`	`can use:`
`5382`	`5383`
`5383`	`5384`	`<synopsis>`

`‎src/backend/utils/mb/wchar.c`

Lines changed: 5 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -1778,10 +1778,7 @@ pg_mic_mblen(const unsigned char *mbstr)`
`1778`	`1778`	`int`
`1779`	`1779`	`pg_encoding_mblen(intencoding,constchar*mbstr)`
`1780`	`1780`	`{`
`1781`		`-Assert(PG_VALID_ENCODING(encoding));`
`1782`		`-`
`1783`		`-return ((encoding >=0&&`
`1784`		`-encoding<sizeof(pg_wchar_table) /sizeof(pg_wchar_tbl)) ?`
	`1781`	`+return (PG_VALID_ENCODING(encoding) ?`
`1785`	`1782`	`((pg_wchar_table[encoding].mblen) ((constunsignedchar)mbstr)) :`
`1786`	`1783`	`((pg_wchar_table[PG_SQL_ASCII].mblen) ((constunsignedchar)mbstr)));`
`1787`	`1784`	`}`
`@@ -1792,10 +1789,7 @@ pg_encoding_mblen(int encoding, const char *mbstr)`
`1792`	`1789`	`int`
`1793`	`1790`	`pg_encoding_dsplen(intencoding,constchar*mbstr)`
`1794`	`1791`	`{`
`1795`		`-Assert(PG_VALID_ENCODING(encoding));`
`1796`		`-`
`1797`		`-return ((encoding >=0&&`
`1798`		`-encoding<sizeof(pg_wchar_table) /sizeof(pg_wchar_tbl)) ?`
	`1792`	`+return (PG_VALID_ENCODING(encoding) ?`
`1799`	`1793`	`((pg_wchar_table[encoding].dsplen) ((constunsignedchar)mbstr)) :`
`1800`	`1794`	`((pg_wchar_table[PG_SQL_ASCII].dsplen) ((constunsignedchar)mbstr)));`
`1801`	`1795`	`}`
`@@ -1808,12 +1802,9 @@ pg_encoding_dsplen(int encoding, const char *mbstr)`
`1808`	`1802`	`int`
`1809`	`1803`	`pg_encoding_verifymb(intencoding,constchar*mbstr,intlen)`
`1810`	`1804`	`{`
`1811`		`-Assert(PG_VALID_ENCODING(encoding));`
`1812`		`-`
`1813`		`-return ((encoding >=0&&`
`1814`		`-encoding<sizeof(pg_wchar_table) /sizeof(pg_wchar_tbl)) ?`
`1815`		`-((pg_wchar_table[encoding].mbverify) ((constunsignedchar)mbstr,len)) :`
`1816`		`-((pg_wchar_table[PG_SQL_ASCII].mbverify) ((constunsignedchar)mbstr,len)));`
	`1805`	`+return (PG_VALID_ENCODING(encoding) ?`
	`1806`	`+((pg_wchar_table[encoding].mbverify) ((constunsignedchar)mbstr,len)) :`
	`1807`	`+((pg_wchar_table[PG_SQL_ASCII].mbverify) ((constunsignedchar)mbstr,len)));`
`1817`	`1808`	`}`
`1818`	`1809`
`1819`	`1810`	`/*`

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!

Commit5db55c6

File tree

2 files changed

2 files changed

`‎doc/src/sgml/libpq.sgml`

`‎src/backend/utils/mb/wchar.c`

0 commit comments