[libvirt PATCH] Remove unused variables

Ján Tomko jtomko at redhat.com
Mon Aug 3 11:42:00 UTC 2020


These variables are only used for assignment and have
no other effect.

Signed-off-by: Ján Tomko <jtomko at redhat.com>
---
Found by clang-analyzer. Just install the package with scan-build and
run:
  ninja -C build scan-build

(or some meson --reconfigure might be necessary.
 OTOH, I did not get ninja coverage to work so far.)

 src/conf/domain_conf.c  | 4 +---
 src/util/virdevmapper.c | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index fd8cdb7695..69e0439e7e 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -8857,8 +8857,6 @@ virDomainHostdevDefParseXMLCaps(xmlNodePtr node G_GNUC_UNUSED,
                                 const char *type,
                                 virDomainHostdevDefPtr def)
 {
-    xmlNodePtr sourcenode;
-
     /* @type is passed in from the caller rather than read from the
      * xml document, because it is specified in different places for
      * different kinds of defs - it is an attribute of
@@ -8881,7 +8879,7 @@ virDomainHostdevDefParseXMLCaps(xmlNodePtr node G_GNUC_UNUSED,
         return -1;
     }
 
-    if (!(sourcenode = virXPathNode("./source", ctxt))) {
+    if (!virXPathNode("./source", ctxt)) {
         virReportError(VIR_ERR_XML_ERROR, "%s",
                        _("Missing <source> element in hostdev device"));
         return -1;
diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c
index a471504176..fe7f611496 100644
--- a/src/util/virdevmapper.c
+++ b/src/util/virdevmapper.c
@@ -162,7 +162,6 @@ virDMSanitizepath(const char *path)
     DIR *dh = NULL;
     const char *p;
     char *ret = NULL;
-    int rc;
 
     /* If a path is NOT provided then assume it's DM name */
     p = strrchr(path, '/');
@@ -192,7 +191,7 @@ virDMSanitizepath(const char *path)
     if (virDirOpen(&dh, DEV_DM_DIR) < 0)
         return NULL;
 
-    while ((rc = virDirRead(dh, &ent, DEV_DM_DIR)) > 0) {
+    while (virDirRead(dh, &ent, DEV_DM_DIR) > 0) {
         g_autofree char *tmp = g_strdup_printf(DEV_DM_DIR "/%s", ent->d_name);
 
         if (stat(tmp, &sb[1]) == 0 &&
-- 
2.26.2




More information about the libvir-list mailing list