From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Wed, 7 Jan 2015 09:32:14 +0000 (+0100)
Subject: test_librbd.cc: close va_list before return in error case
X-Git-Tag: suse_latest~36^2~9^2~27
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=699e8695481cfa2c44689c88376f77000cd6cb38;p=ceph.git

test_librbd.cc: close va_list before return in error case

Fix for:
[src/test/librbd/test_librbd.cc:322]: (error) va_list 'ap' was
 opened but not closed by va_end().
[src/test/librbd/test_librbd.cc:379]: (error) va_list 'ap' was
 opened but not closed by va_end().

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/src/test/librbd/test_librbd.cc b/src/test/librbd/test_librbd.cc
index 39014f06aa5..abf7764727f 100644
--- a/src/test/librbd/test_librbd.cc
+++ b/src/test/librbd/test_librbd.cc
@@ -322,6 +322,7 @@ int test_ls(rados_ioctx_t io_ctx, size_t num_expected, ...)
       image_names.erase(it);
     } else {
       ADD_FAILURE() << "Unable to find image " << expected;
+      va_end(ap);
       return -ENOENT;
     }
   }
@@ -379,6 +380,7 @@ int test_ls_pp(librbd::RBD& rbd, librados::IoCtx& io_ctx, size_t num_expected, .
     vector<string>::iterator listed_name = find(names.begin(), names.end(), string(expected));
     if (listed_name == names.end()) {
       ADD_FAILURE() << "Unable to find image " << expected;
+      va_end(ap);
       return -ENOENT;
     }
     names.erase(listed_name);