Commitb802412

committed

Fix output of Unicode normalization test

Several off-by-more-than-one errors caused the output in case of atest failure to be truncated and unintelligible.Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>Discussion:https://www.postgresql.org/message-id/flat/6a7a8516-7d11-8fbd-0e8b-eadb4f0679eb%402ndquadrant.com

1 parentc341c7d commitb802412Copy full SHA for b802412

File tree

-6

lines changed

-6

lines changed

Lines changed: 9 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,17 +23,20 @@ static char *`
`23`	`23`	`print_wchar_str(constpg_wchar*s)`
`24`	`24`	`{`
`25`	`25`	`#defineBUF_DIGITS 50`
`26`		`-staticcharbuf[BUF_DIGITS*2+1];`
	`26`	`+staticcharbuf[BUF_DIGITS*11+1];`
`27`	`27`	`inti;`
	`28`	`+char*p;`
`28`	`29`
`29`	`30`	`i=0;`
	`31`	`+p=buf;`
`30`	`32`	`while (*s&&i<BUF_DIGITS)`
`31`	`33`	`{`
`32`		`-snprintf(&buf[i2],3,"%04X",s);`
	`34`	`+p+=sprintf(p,"U+%04X",*s);`
`33`	`35`	`i++;`
`34`	`36`	`s++;`
`35`	`37`	`}`
`36`		`-buf[i*2]='\0';`
	`38`	`+*p='\0';`
	`39`	`+`
`37`	`40`	`returnbuf;`
`38`	`41`	`}`
`39`	`42`
`@@ -67,9 +70,9 @@ main(int argc, char **argv)`
`67`	`70`	`if (pg_wcscmp(test->output,result)!=0)`
`68`	`71`	`{`
`69`	`72`	`printf("FAILURE (NormalizationTest.txt line %d):\n",test->linenum);`
`70`		`-printf("input:\t%s\n",print_wchar_str(test->input));`
`71`		`-printf("expected:\t%s\n",print_wchar_str(test->output));`
`72`		`-printf("got\t%s\n",print_wchar_str(result));`
	`73`	`+printf("input:%s\n",print_wchar_str(test->input));`
	`74`	`+printf("expected:%s\n",print_wchar_str(test->output));`
	`75`	`+printf("got:%s\n",print_wchar_str(result));`
`73`	`76`	`printf("\n");`
`74`	`77`	`exit(1);`
`75`	`78`	`}`

Comments

(0)