From: Andrea Bolognani <abologna@redhat.com>
Date: Wed, 27 Jan 2016 09:35:17 +0000 (+0100)
Subject: virnetdevopenvswitch: Don't call strlen() twice on the same string
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d87f0c00520e1196dce1874cb9cfb9f8b54af891;p=libvirt.git

virnetdevopenvswitch: Don't call strlen() twice on the same string

Commit 871e10f fixed a memory corruption error, but called strlen()
twice on the same string to do so. Even though the compiler is
probably smart enough to optimize the second call away, having a
single invocation makes the code slightly cleaner.

Suggested-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c
index db01dcf2c0..9283bbb6d9 100644
--- a/src/util/virnetdevopenvswitch.c
+++ b/src/util/virnetdevopenvswitch.c
@@ -207,6 +207,7 @@ int virNetDevOpenvswitchRemovePort(const char *brname ATTRIBUTE_UNUSED, const ch
 int virNetDevOpenvswitchGetMigrateData(char **migrate, const char *ifname)
 {
     virCommandPtr cmd = NULL;
+    size_t len;
     int ret = -1;
 
     cmd = virCommandNewArgList(OVSVSCTL, "--timeout=5", "--if-exists", "get", "Interface",
@@ -223,8 +224,9 @@ int virNetDevOpenvswitchGetMigrateData(char **migrate, const char *ifname)
     }
 
     /* Wipeout the newline, if it exists */
-    if (strlen(*migrate) > 0)
-        (*migrate)[strlen(*migrate) - 1] = '\0';
+    len = strlen(*migrate);
+    if (len > 0)
+        (*migrate)[len - 1] = '\0';
 
     ret = 0;
  cleanup: