diff options
| author | John Naylor | 2022-08-05 06:07:31 +0000 |
|---|---|---|
| committer | John Naylor | 2022-08-05 09:50:22 +0000 |
| commit | 6b41a1579bd37aa95924d592d7a18a79d669662f (patch) | |
| tree | 2459465c5ccb1567728d69231544336f805d4d15 | |
| parent | 82593b9a3d5f1c58157f6e8fd7d69ef0d6f6eeb3 (diff) | |
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
| -rw-r--r-- | src/include/mb/pg_wchar.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/include/mb/pg_wchar.h b/src/include/mb/pg_wchar.h index 31f5b393da..011b0b3abd 100644 --- a/src/include/mb/pg_wchar.h +++ b/src/include/mb/pg_wchar.h @@ -709,13 +709,14 @@ extern WCHAR *pgwin32_message_to_UTF16(const char *str, int len, int *utf16len); static inline bool is_valid_ascii(const unsigned char *s, int len) { + const unsigned char *const s_end = s + len; uint64 chunk, highbit_cum = UINT64CONST(0), zero_cum = UINT64CONST(0x8080808080808080); Assert(len % sizeof(chunk) == 0); - while (len > 0) + while (s < s_end) { memcpy(&chunk, s, sizeof(chunk)); @@ -734,11 +735,10 @@ is_valid_ascii(const unsigned char *s, int len) */ zero_cum &= (chunk + UINT64CONST(0x7f7f7f7f7f7f7f7f)); - /* Capture any set bits in this chunk. */ + /* Capture all set bits in this chunk. */ highbit_cum |= chunk; s += sizeof(chunk); - len -= sizeof(chunk); } /* Check if any high bits in the high bit accumulator got set. */ |