Use qemu_strsep instead of strsep

ChefKissInc · Jul 18, 2024 · 245a8f0 · 245a8f0
1 parent 6a4d304
commit 245a8f0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/hw/arm/apple-silicon/boot.c b/hw/arm/apple-silicon/boot.c
@@ -28,6 +28,7 @@
 #include "hw/arm/apple-silicon/dtb.h"
 #include "hw/arm/apple-silicon/mem.h"
 #include "qapi/error.h"
+#include "qemu/cutils.h"
 #include "qemu/error-report.h"
 #include "qemu/guest-random.h"
 #include "img4.h"
@@ -710,7 +711,7 @@ bool xnu_contains_boot_arg(const char *bootArgs, const char *arg,
         return false;
     }
 
-    while ((token = strsep(&pos, " ")) != NULL) {
+    while ((token = qemu_strsep(&pos, " ")) != NULL) {
         if (prefixmatch && strncmp(token, arg, arglen) == 0) {
             return true;
         } else if (strcmp(token, arg) == 0) {

diff --git a/hw/arm/apple-silicon/dtb.c b/hw/arm/apple-silicon/dtb.c
@@ -23,6 +23,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/arm/apple-silicon/dtb.h"
+#include "qemu/cutils.h"
 
 #define min(_a, _b) ((_a) < (_b) ? (_a) : (_b))
 
@@ -311,7 +312,7 @@ DTBNode *find_dtb_node(DTBNode *node, const char *path)
 
     g_assert(node && path);
 
-    while (node && found && ((next = strsep(&s, "/")))) {
+    while (node && found && ((next = qemu_strsep(&s, "/")))) {
         if (strlen(next) == 0) {
             continue;
         }
@@ -347,7 +348,7 @@ DTBNode *get_dtb_node(DTBNode *node, const char *path)
 
     g_assert(node && path);
 
-    while (node && ((name = strsep(&s, "/")))) {
+    while (node && ((name = qemu_strsep(&s, "/")))) {
         bool found = false;
         if (strlen(name) == 0) {
             continue;