Replace atoi() with strtoi_with_tail()

Replace atoi() with strtoi_with_tail() #18565