External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-02 04:15:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

nss: remove use for virString helper APIs

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

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2019-07-30 15:33:20 +01:00
parent b6a2bd4ac0
commit a7ace0db49
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/nss/libvirt_nss.c
View File

@ -41,7 +41,6 @@
#include "virfile.h"
#include "virtime.h"
#include "virerror.h"
#include "virstring.h"
#include "virsocketaddr.h"
#include "configmake.h"
#include "virmacmap.h"
@ -193,13 +192,20 @@ findLeaseInJSON(leaseAddress **tmpAddress,
}
if (macs) {
const char **macstmp = macs;
const char *macAddr;
bool match = false;
macAddr = virJSONValueObjectGetString(lease, "mac-address");
if (!macAddr)
continue;
if (!virStringListHasString(macs, macAddr))
while (*macstmp && !match) {
if (STREQ(*macstmp, macAddr))
match = true;
macstmp++;
}
if (!match)
continue;
} else {
const char *lease_name;
@ -295,8 +301,9 @@ findLease(const char *name,
DEBUG("Dir: %s", leaseDir);
while ((entry = readdir(dir)) != NULL) {
char *path;
size_t dlen = strlen(entry->d_name);
if (virStringHasSuffix(entry->d_name, ".status")) {
if (dlen >= 7 && STREQ(entry->d_name + dlen - 7, ".status")) {
if (!(path = virFileBuildPath(leaseDir, entry->d_name, NULL)))
goto cleanup;
@ -307,7 +314,7 @@ findLease(const char *name,
goto cleanup;
}
VIR_FREE(path);
} else if (virStringHasSuffix(entry->d_name, ".macs")) {
} else if (dlen >= 5 && STREQ(entry->d_name + dlen - 5, ".macs")) {
if (!(path = virFileBuildPath(leaseDir, entry->d_name, NULL)))
goto cleanup;