Commit6b41a15

committed

Simplify coding style of is_valid_ascii()

Calculate end of input rather than maintaining length,per prior suggestion from Heikki Linnakangas. In passing,use more natural language in a comment.Discussion:https://www.postgresql.org/message-id/b4648cc2-5e9c-c93a-52cc-51e5c658a4f6%40iki.fi

1 parent82593b9 commit6b41a15Copy full SHA for 6b41a15

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -709,13 +709,14 @@ extern WCHAR pgwin32_message_to_UTF16(const char str, int len, int *utf16len);`
`709`	`709`	`staticinlinebool`
`710`	`710`	`is_valid_ascii(constunsignedchar*s,intlen)`
`711`	`711`	`{`
	`712`	`+constunsignedchar*consts_end=s+len;`
`712`	`713`	`uint64chunk,`
`713`	`714`	`highbit_cum=UINT64CONST(0),`
`714`	`715`	`zero_cum=UINT64CONST(0x8080808080808080);`
`715`	`716`
`716`	`717`	`Assert(len %sizeof(chunk)==0);`
`717`	`718`
`718`		`-while (len>0)`
	`719`	`+while (s<s_end)`
`719`	`720`	`{`
`720`	`721`	`memcpy(&chunk,s,sizeof(chunk));`
`721`	`722`
`@@ -734,11 +735,10 @@ is_valid_ascii(const unsigned char *s, int len)`
`734`	`735`	`*/`
`735`	`736`	`zero_cum &= (chunk+UINT64CONST(0x7f7f7f7f7f7f7f7f));`
`736`	`737`
`737`		`-/* Captureany set bits in this chunk. */`
	`738`	`+/* Captureall set bits in this chunk. */`
`738`	`739`	`highbit_cum \|=chunk;`
`739`	`740`
`740`	`741`	`s+=sizeof(chunk);`
`741`		`-len-=sizeof(chunk);`
`742`	`742`	`}`
`743`	`743`
`744`	`744`	`/* Check if any high bits in the high bit accumulator got set. */`

Comments

(0)