NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit2771fce

committed

Fix issue with --enable-coverage and the new unicode {de,re}composition code

genhtml has been generating the following warning with this new code:WARNING: function data mismatch at /path/src/common/unicode_norm.c:102HTML coverage reports care about the uniqueness of functions defined insource files, ignoring any assumptions around CFLAGS.783f0ccintroduced a duplicated definition of get_code_entry(), leading to awarning and potentially some incorrect data generated in the reports.This refactors the code so as the code has only one functiondeclaration, fixing the warning.Oversight in783f0cc.Reported-by: Tom LaneAuthor: Michael PaquierReviewed-by: Tom LaneDiscussion:https://postgr.es/m/207789.1603469272@sss.pgh.pa.us

1 parent0b46e82 commit2771fceCopy full SHA for 2771fce

File tree

1 file changed

+17

-21

lines changed

src/common
- unicode_norm.c

1 file changed

+17

-21

lines changed

`‎src/common/unicode_norm.c`

Lines changed: 17 additions & 21 deletions

Original file line number	Diff line number	Diff line change
`@@ -46,18 +46,32 @@`
`46`	`46`	`#defineNCOUNTVCOUNT * TCOUNT`
`47`	`47`	`#defineSCOUNTLCOUNT * NCOUNT`
`48`	`48`
	`49`	`+#ifdefFRONTEND`
	`50`	`+/* comparison routine for bsearch() of decomposition lookup table. */`
	`51`	`+staticint`
	`52`	`+conv_compare(constvoidp1,constvoidp2)`
	`53`	`+{`
	`54`	`+uint32v1,`
	`55`	`+v2;`
	`56`	`+`
	`57`	`+v1=(constuint32)p1;`
	`58`	`+v2= ((constpg_unicode_decomposition*)p2)->codepoint;`
	`59`	`+return (v1>v2) ?1 : ((v1==v2) ?0 :-1);`
	`60`	`+}`
	`61`	`+`
	`62`	`+#endif`
	`63`	`+`
`49`	`64`	`/*`
`50`	`65`	`* get_code_entry`
`51`	`66`	`*`
`52`	`67`	`* Get the entry corresponding to code in the decomposition lookup table.`
`53`	`68`	`* The backend version of this code uses a perfect hash function for the`
`54`	`69`	`* lookup, while the frontend version uses a binary search.`
`55`	`70`	`*/`
`56`		`-#ifndefFRONTEND`
`57`		`-`
`58`	`71`	`staticconstpg_unicode_decomposition*`
`59`	`72`	`get_code_entry(pg_wcharcode)`
`60`	`73`	`{`
	`74`	`+#ifndefFRONTEND`
`61`	`75`	`inth;`
`62`	`76`	`uint32hashkey;`
`63`	`77`	`pg_unicode_decompinfodecompinfo=UnicodeDecompInfo;`
`@@ -82,33 +96,15 @@ get_code_entry(pg_wchar code)`
`82`	`96`
`83`	`97`	`/* Success! */`
`84`	`98`	`return&decompinfo.decomps[h];`
`85`		`-}`
`86`		`-`
`87`	`99`	`#else`
`88`		`-`
`89`		`-/* comparison routine for bsearch() of decomposition lookup table. */`
`90`		`-staticint`
`91`		`-conv_compare(constvoidp1,constvoidp2)`
`92`		`-{`
`93`		`-uint32v1,`
`94`		`-v2;`
`95`		`-`
`96`		`-v1=(constuint32)p1;`
`97`		`-v2= ((constpg_unicode_decomposition*)p2)->codepoint;`
`98`		`-return (v1>v2) ?1 : ((v1==v2) ?0 :-1);`
`99`		`-}`
`100`		`-`
`101`		`-staticconstpg_unicode_decomposition*`
`102`		`-get_code_entry(pg_wcharcode)`
`103`		`-{`
`104`	`100`	`returnbsearch(&(code),`
`105`	`101`	`UnicodeDecompMain,`
`106`	`102`	`lengthof(UnicodeDecompMain),`
`107`	`103`	`sizeof(pg_unicode_decomposition),`
`108`	`104`	`conv_compare);`
	`105`	`+#endif`
`109`	`106`	`}`
`110`	`107`
`111`		`-#endif/* !FRONTEND */`
`112`	`108`
`113`	`109`	`/*`
`114`	`110`	`* Given a decomposition entry looked up earlier, get the decomposed`

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!

Commit2771fce

File tree

1 file changed

1 file changed

`‎src/common/unicode_norm.c`

0 commit comments