zaks.anna added a comment. > Do you plan to actually replace internal_strncpy / internal_strncat in the subsequent changes? No. I want to use it in an upcoming patch. Do you think we should replace all uses? http://reviews.llvm.org/D14714