use strbuf_addstr() instead of strbuf_addf() with "%s", part 2