[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH 11/17] nss: remove use for virFile helper APIs



Use the plain libc APIs to avoid a dependancy on the main libvirt
code from the nss module.

Signed-off-by: Daniel P. Berrangé <berrange redhat com>
---
 cfg.mk                  | 2 +-
 tools/nss/libvirt_nss.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/cfg.mk b/cfg.mk
index f2b326ec94..f4cd215abc 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -1223,7 +1223,7 @@ exclude_file_name_regexp--sc_prohibit_access_xok = \
 	^(cfg\.mk|src/util/virutil\.c)$$
 
 exclude_file_name_regexp--sc_prohibit_asprintf = \
-  ^(cfg\.mk|bootstrap.conf$$|examples/|src/util/virstring\.[ch]$$|tests/vircgroupmock\.c|tools/virt-login-shell\.c$$)
+  ^(cfg\.mk|bootstrap.conf$$|examples/|src/util/virstring\.[ch]$$|tests/vircgroupmock\.c|tools/virt-login-shell\.c|tools/nss/libvirt_nss\.c$$)
 
 exclude_file_name_regexp--sc_prohibit_strdup = \
   ^(docs/|examples/|src/util/virstring\.c|tests/vir(netserverclient|cgroup)mock.c|tests/commandhelper\.c$$)
diff --git a/tools/nss/libvirt_nss.c b/tools/nss/libvirt_nss.c
index d057827ebc..ed2ad956e9 100644
--- a/tools/nss/libvirt_nss.c
+++ b/tools/nss/libvirt_nss.c
@@ -38,7 +38,6 @@
 
 #include "virlease.h"
 #include "viralloc.h"
-#include "virfile.h"
 #include "virtime.h"
 #include "virerror.h"
 #include "virsocketaddr.h"
@@ -304,7 +303,7 @@ findLease(const char *name,
         size_t dlen = strlen(entry->d_name);
 
         if (dlen >= 7 && STREQ(entry->d_name + dlen - 7, ".status")) {
-            if (!(path = virFileBuildPath(leaseDir, entry->d_name, NULL)))
+            if (asprintf(&path, "%s/%s", leaseDir, entry->d_name) < 0)
                 goto cleanup;
 
             DEBUG("Processing %s", path);
@@ -315,7 +314,7 @@ findLease(const char *name,
             }
             VIR_FREE(path);
         } else if (dlen >= 5 && STREQ(entry->d_name + dlen - 5, ".macs")) {
-            if (!(path = virFileBuildPath(leaseDir, entry->d_name, NULL)))
+            if (asprintf(&path, "%s/%s", leaseDir, entry->d_name) < 0)
                 goto cleanup;
 
             if (VIR_REALLOC_N_QUIET(macmaps, nMacmaps + 1) < 0) {
-- 
2.21.0


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]