Merge branch 'rs/cocci-strbuf-addf-to-addstr'