Skip to content

Commit 307e241

Browse files
authored
Merge pull request #321 from libos-nuse/fix-qdisc-strtok
lkl: follow up fixes for strtok_r/strtok_s usage
2 parents 658cc55 + 00dce0c commit 307e241

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

tools/lkl/lib/net.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -577,17 +577,18 @@ int lkl_qdisc_add(int ifindex, char *root, char *type)
577577
*/
578578
void lkl_qdisc_parse_add(int ifindex, char *entries)
579579
{
580-
char *token = NULL;
580+
char *saveptr = NULL, *token = NULL;
581581
char *root = NULL, *type = NULL;
582582
int ret = 0;
583583

584-
for (token = strtok(entries, ";"); token; token = strtok(NULL, ";")) {
584+
for (token = strtok_r(entries, ";", &saveptr); token;
585+
token = strtok_r(NULL, ";", &saveptr)) {
585586
root = strtok(token, "|");
586587
type = strtok(NULL, "|");
587588
ret = lkl_qdisc_add(ifindex, root, type);
588589
if (ret) {
589-
fprintf(stderr, "Failed to add qdisc entry: %s\n",
590-
lkl_strerror(ret));
590+
lkl_printf("Failed to add qdisc entry: %s\n",
591+
lkl_strerror(ret));
591592
return;
592593
}
593594
}

0 commit comments

Comments
 (0)