NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit3c6cd8a

committed

Fixes motivated by snake and spoonbill pgbuildfarm members

1 parent725ace4 commit3c6cd8aCopy full SHA for 3c6cd8a

File tree

3 files changed

+18

-13

lines changed

contrib/tsearch2
- ts_locale.c
- ts_locale.h
- wordparser
  - parser.c

3 files changed

+18

-13

lines changed

`‎contrib/tsearch2/ts_locale.c`

Lines changed: 13 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,39 +8,44 @@`
`8`	`8`	`#if defined(TS_USE_WIDE)&& defined(WIN32)`
`9`	`9`
`10`	`10`	`size_t`
`11`		`-wchar2char(constcharto,constwchar_tfrom,size_tlen ) {`
	`11`	`+wchar2char(charto,constwchar_tfrom,size_tlen ) {`
`12`	`12`	`if (GetDatabaseEncoding()==PG_UTF8) {`
`13`		`-intr;`
	`13`	`+intr,nbytes;`
`14`	`14`
`15`	`15`	`if (len==0)`
`16`	`16`	`return0;`
`17`	`17`
	`18`	`+/* in any case, to should be allocated with enough space /`
	`19`	`+nbytes=WideCharToMultiByte(CP_UTF8,0,from,len,NULL,0,NULL,NULL);`
	`20`	`+if (nbytes==0 )`
	`21`	`+ereport(ERROR,`
	`22`	`+(errcode(ERRCODE_CHARACTER_NOT_IN_REPERTOIRE),`
	`23`	`+errmsg("UTF-16 to UTF-8 translation failed: %lu",`
	`24`	`+GetLastError())));`
	`25`	`+`
`18`	`26`	`r=WideCharToMultiByte(CP_UTF8,0,from,len,to,nbytes,`
`19`	`27`	`NULL,NULL);`
`20`	`28`
`21`		`-`
`22`	`29`	`if (r==0 )`
`23`	`30`	`ereport(ERROR,`
`24`	`31`	`(errcode(ERRCODE_CHARACTER_NOT_IN_REPERTOIRE),`
`25`	`32`	`errmsg("UTF-16 to UTF-8 translation failed: %lu",`
`26`	`33`	`GetLastError())));`
`27`		`-`
`28`	`34`	`returnr;`
`29`	`35`	`}`
`30`	`36`
`31`	`37`	`returnwcstombs(to,from,len);`
`32`	`38`	`}`
`33`	`39`
`34`	`40`	`size_t`
`35`		`-char2wchar(constwchar_tto,constcharfrom,size_tlen ) {`
	`41`	`+char2wchar(wchar_tto,constcharfrom,size_tlen ) {`
`36`	`42`	`if (GetDatabaseEncoding()==PG_UTF8) {`
`37`	`43`	`intr;`
`38`	`44`
`39`	`45`	`if (len==0)`
`40`	`46`	`return0;`
`41`	`47`
`42`		`-r=MultiByteToWideChar(CP_UTF8,0,from,len,`
`43`		`-to,len);`
	`48`	`+r=MultiByteToWideChar(CP_UTF8,0,from,len,to,len);`
`44`	`49`
`45`	`50`	`if (!r) {`
`46`	`51`	`pg_verifymbstr(from,len, false);`
`@@ -50,7 +55,7 @@ char2wchar( const wchar_t to, const char from, size_t len ) {`
`50`	`55`	`errhint("The server's LC_CTYPE locale is probably incompatible with the database encoding.")));`
`51`	`56`	`}`
`52`	`57`
`53`		`-Assert(r <=nbytes);`
	`58`	`+Assert(r <=len);`
`54`	`59`
`55`	`60`	`returnr;`
`56`	`61`	`}`

`‎contrib/tsearch2/ts_locale.h`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@`
`22`	`22`
`23`	`23`	`#ifdefWIN32`
`24`	`24`
`25`		`-size_twchar2char(constcharto,constwchar_tfrom,size_tlen );`
`26`		`-size_tchar2wchar(constwchar_tto,constcharfrom,size_tlen );`
	`25`	`+size_twchar2char(charto,constwchar_tfrom,size_tlen );`
	`26`	`+size_tchar2wchar(wchar_tto,constcharfrom,size_tlen );`
`27`	`27`
`28`	`28`	`#else/* WIN32 */`
`29`	`29`

`‎contrib/tsearch2/wordparser/parser.c`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ TParserClose( TParser* prs ) {`
`79`	`79`	`static int\`
`80`	`80`	`p_is##type(TParser *prs) {\`
`81`	`81`	`Assert( prs->state );\`
`82`		`-return ( ( prs->usewide ) ? isw##type( (wint_t)*( prs->wstr + prs->state->poschar ) ) :\`
	`82`	`+return ( ( prs->usewide ) ? isw##type( (wint_t)*( prs->wstr + prs->state->poschar ) ) :\`
`83`	`83`	`is##type( (unsigned char)*( prs->str + prs->state->posbyte ) ) );\`
`84`	`84`	`}\`
`85`	`85`	`\`
`@@ -104,7 +104,7 @@ p_iseq(TParser *prs, char c) {`
`104`	`104`	`static int\`
`105`	`105`	`p_is##type(TParser *prs) {\`
`106`	`106`	`Assert( prs->state );\`
`107`		`-return is##type( (unsigned char)*( prs->str + prs->state->posbyte ) ) );\`
	`107`	`+return is##type( (unsigned char)*( prs->str + prs->state->posbyte ) );\`
`108`	`108`	`}\`
`109`	`109`	`\`
`110`	`110`	`static int\`
`@@ -116,7 +116,7 @@ p_isnot##type(TParser *prs) {\`
`116`	`116`	`staticint`
`117`	`117`	`p_iseq(TParser*prs,charc) {`
`118`	`118`	`Assert(prs->state );`
`119`		`-return (*(prs->str+prs->state->posbyte )==c ))?1 :0;`
	`119`	`+return (*(prs->str+prs->state->posbyte )==c ) ?1 :0;`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`#endif/* TS_USE_WIDE */`

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!

Commit3c6cd8a

File tree

3 files changed

3 files changed

`‎contrib/tsearch2/ts_locale.c`

`‎contrib/tsearch2/ts_locale.h`

`‎contrib/tsearch2/wordparser/parser.c`

0 commit comments