On 06/19/2017 06:27 PM, Andreas Schwab wrote: >> + /* Skip over the substring and the following delimiter. */ >> + p += len; >> + if (*p == ' ' || *p == ':') > If you use *p != '\0' you don't have to repeat the list of delimiters. Thanks, applied. Florian