convert trivial cases to FLEX_ARRAY macros

convert trivial cases to FLEX_ARRAY macros

Using FLEX_ARRAY macros reduces the amount of manual
computation size we have to do. It also ensures we don't
overflow size_t, and it makes sure we write the same number
of bytes that we allocated.

Signed-off-by: Jeff King <redacted>
Signed-off-by: Junio C Hamano <redacted>