Rockbox open source high quality audio player as a Music Player Daemon
mpris
rockbox
mpd
libadwaita
audio
rust
zig
deno
misc.c split_string replace with strtok_r
there isn't much difference from this function to strtok_r
now places a NULL in the last vector space permitting as well
Change-Id: Ibaaa1ad01b5054c41a6410788a2333b8d11a7cf7
+6
-10
+6
-10
apps/misc.c
+6
-10
apps/misc.c
···
1384
1384
int split_string(char *str, const char split_char, char *vector[], const int vector_length)
1385
1385
{
1386
1386
int i;
1387
-
char *p = str;
1388
-
1389
-
/* skip leading splitters */
1390
-
while(*p == split_char) p++;
1387
+
char sep[2] = {split_char, '\0'};
1388
+
char *e, *p = strtok_r(str, sep, &e);
1391
1389
1392
1390
/* *p in the condition takes care of trailing splitters */
1393
-
for(i = 0; p && *p && i < vector_length; i++)
1391
+
for(i = 0; i < vector_length; i++)
1394
1392
{
1395
1393
vector[i] = p;
1396
-
if ((p = strchr(p, split_char)))
1397
-
{
1398
-
*p++ = '\0';
1399
-
while(*p == split_char) p++; /* skip successive splitters */
1400
-
}
1394
+
if (!p)
1395
+
break;
1396
+
p = strtok_r(NULL, sep, &e);
1401
1397
}
1402
1398
1403
1399
return i;