From: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Thu, 17 Jan 2019 11:43:34 +0000 (+0400)
Subject: net/slirp: simplify checking for cmd: prefix
X-Git-Tag: v4.0.0-rc0~107^2~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3624730a32ff10a4621ba83c459941b5bee5adb1;p=thirdparty%2Fqemu.git

net/slirp: simplify checking for cmd: prefix

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
---

diff --git a/net/slirp.c b/net/slirp.c
index ec07f662c00..b91741b8fc1 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -773,7 +773,7 @@ static int slirp_guestfwd(SlirpState *s, const char *config_str, Error **errp)
 
     snprintf(buf, sizeof(buf), "guestfwd.tcp.%d", port);
 
-    if ((strlen(p) > 4) && !strncmp(p, "cmd:", 4)) {
+    if (g_str_has_prefix(p, "cmd:")) {
         if (slirp_add_exec(s->slirp, &p[4], &server, port) < 0) {
             error_setg(errp, "Conflicting/invalid host:port in guest "
                        "forwarding rule '%s'", config_str);