- if( !strncmp( s, psz_word, i_len )
- && memchr( ",", s[i_len], 2 ) )
- return s;
+ const char *end = strchr( psz_list, ',' );
+ if( end == NULL )
+ break;
+
+ if( !strncmp( psz_list, psz_word, end - psz_list ) )
+ return psz_list;
+ psz_list = end + 1;