[Spice-devel] [spice-gtk v2 2/2] mingw: Fix compilation breakage because of memmem use

Christophe Fergeau cfergeau at redhat.com
Mon Oct 1 15:58:23 UTC 2018


mingw does not provide memmem. Since the qmp data is JSON, it won't
contain embedded nul characters, we can use g_strstr_len instead of
memmem.

Signed-off-by: Christophe Fergeau <cfergeau at redhat.com>
---

Changes since v1:
- rework commit log
- use strstr instead of g_strstr_len

 src/qmp-port.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/qmp-port.c b/src/qmp-port.c
index c91f967a..7726af4e 100644
--- a/src/qmp-port.c
+++ b/src/qmp-port.c
@@ -160,7 +160,7 @@ spice_qmp_handle_port_data(SpiceQmpPort *self, gpointer data,
     }
 
     str = qmp->str;
-    while ((crlf = memmem(str, qmp->len - (str - qmp->str), "\r\n", 2))) {
+    while ((crlf = strstr(str, "\r\n"))) {
         GError *err = NULL;
 
         *crlf = '\0';
-- 
2.19.0



More information about the Spice-devel mailing list