diff options
| author | Bruce Hill <bruce@bruce-hill.com> | 2024-06-06 15:05:35 -0400 |
|---|---|---|
| committer | Bruce Hill <bruce@bruce-hill.com> | 2024-06-06 15:05:35 -0400 |
| commit | e9abf8a370b0256f96108048eec95b68ef92effc (patch) | |
| tree | 5987fc28bc90605a7f6e6fa57fbc9da3b1d8deac /builtins/text.c | |
| parent | b4dc8587946d5300ae983c9c3cfc2d03f76ed746 (diff) | |
Prefer 'sizeof(t[n])' over 'sizeof(t)*n'
Diffstat (limited to 'builtins/text.c')
| -rw-r--r-- | builtins/text.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/builtins/text.c b/builtins/text.c index e8c476a3..f39d42ee 100644 --- a/builtins/text.c +++ b/builtins/text.c @@ -273,7 +273,7 @@ public array_t Text$split(CORD str, CORD split) size_t non_split = u8_strcspn(ustr + i, usplit); CORD chunk = CORD_substr((CORD)ustr, i, non_split); if (capacity <= 0) - strings.data = GC_REALLOC(strings.data, sizeof(CORD)*(capacity += 10)); + strings.data = GC_REALLOC(strings.data, sizeof(CORD[capacity += 10])); ((CORD*)strings.data)[strings.length++] = chunk; i += non_split; @@ -327,7 +327,7 @@ public array_t Text$codepoints(CORD text) uint32_t *codepoints = u8_to_u32(normalized, norm_len-1, codepoint_buf, &codepoint_len); array_t ret = { .length=codepoint_len, - .data=memcpy(GC_MALLOC_ATOMIC(sizeof(int32_t)*codepoint_len), codepoints, sizeof(int32_t)*codepoint_len), + .data=memcpy(GC_MALLOC_ATOMIC(sizeof(int32_t[codepoint_len])), codepoints, sizeof(int32_t[codepoint_len])), .stride=sizeof(int32_t), .atomic=1, }; @@ -345,7 +345,7 @@ public array_t Text$bytes(CORD text) --norm_len; // NUL byte array_t ret = { .length=norm_len, - .data=memcpy(GC_MALLOC_ATOMIC(sizeof(uint8_t)*norm_len), normalized, sizeof(uint8_t)*norm_len), + .data=memcpy(GC_MALLOC_ATOMIC(sizeof(uint8_t[norm_len])), normalized, sizeof(uint8_t[norm_len])), .stride=sizeof(uint8_t), .atomic=1, }; @@ -389,7 +389,7 @@ public int64_t Text$num_bytes(CORD text) public array_t Text$character_names(CORD text) { array_t codepoints = Text$codepoints(text); - array_t ret = {.length=codepoints.length, .stride=sizeof(CORD), .data=GC_MALLOC(sizeof(CORD)*codepoints.length)}; + array_t ret = {.length=codepoints.length, .stride=sizeof(CORD), .data=GC_MALLOC(sizeof(CORD[codepoints.length]))}; for (int64_t i = 0; i < codepoints.length; i++) { char buf[UNINAME_MAX]; unicode_character_name(*(ucs4_t*)(codepoints.data + codepoints.stride*i), buf); |