[tz] [PATCH 3/3] Stop using strchr