External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-02 23:23:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

virParseVersionString: rename to virStringParseVersion

Browse Source 
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Laine Stump <laine@redhat.com>
This commit is contained in:
Ján Tomko 2020-02-24 00:47:18 +01:00
parent f40179b9fb
commit 8eb7d869ed
17 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bhyve/bhyve_driver.c
View File

@ -267,7 +267,7 @@ bhyveConnectGetVersion(virConnectPtr conn, unsigned long *version)
uname(&ver);
if (virParseVersionString(ver.release, version, true) < 0) {
if (virStringParseVersion(version, ver.release, true) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Unknown release: %s"), ver.release);
return -1;

2
src/ch/ch_conf.c
View File

@ -204,7 +204,7 @@ chExtractVersion(virCHDriver *driver)
return -1;
}
if (virParseVersionString(tmp, &version, true) < 0) {
if (virStringParseVersion(&version, tmp, true) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Unable to parse cloud-hypervisor version: %s"), tmp);
return -1;

8
src/esx/esx_vi.c
View File

@ -869,8 +869,8 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url,
return -1;
}
if (virParseVersionString(ctx->service->about->apiVersion,
&ctx->apiVersion, true) < 0) {
if (virStringParseVersion(&ctx->apiVersion,
ctx->service->about->apiVersion, true) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Could not parse VI API version '%s'"),
ctx->service->about->apiVersion);
@ -884,8 +884,8 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url,
return -1;
}
if (virParseVersionString(ctx->service->about->version,
&ctx->productVersion, true) < 0) {
if (virStringParseVersion(&ctx->productVersion,
ctx->service->about->version, true) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Could not parse product version '%s'"),
ctx->service->about->version);

2
src/libvirt_private.syms
View File

@ -3303,7 +3303,6 @@ virStorageFileParseBackingStoreStr;
# util/virstring.h
virParseVersionString;
virSkipSpaces;
virSkipSpacesAndBackslash;
virSkipSpacesBackwards;
@ -3320,6 +3319,7 @@ virStringIsPrintable;
virStringMatch;
virStringMatchesNameSuffix;
virStringParsePort;
virStringParseVersion;
virStringParseYesNo;
virStringReplace;
virStringSearch;

2
src/lxc/lxc_driver.c
View File

@ -1656,7 +1656,7 @@ static int lxcConnectGetVersion(virConnectPtr conn, unsigned long *version)
if (virConnectGetVersionEnsureACL(conn) < 0)
return -1;
if (virParseVersionString(ver.release, version, true) < 0) {
if (virStringParseVersion(version, ver.release, true) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown release: %s"), ver.release);
return -1;
}

4
src/nwfilter/nwfilter_ebiptables_driver.c
View File

@ -3656,7 +3656,7 @@ ebiptablesDriverProbeCtdir(void)
}
/* following Linux lxr, the logic was inverted in 2.6.39 */
if (virParseVersionString(utsname.release, &thisversion, true) < 0) {
if (virStringParseVersion(&thisversion, utsname.release, true) < 0) {
VIR_ERROR(_("Could not determine kernel version from string %s"),
utsname.release);
return;
@ -3689,7 +3689,7 @@ ebiptablesDriverProbeStateMatchQuery(virFirewall *fw G_GNUC_UNUSED,
* 'iptables v1.4.16'
*/
if (!(tmp = strchr(lines[0], 'v')) ||
virParseVersionString(tmp + 1, version, true) < 0) {
virStringParseVersion(version, tmp + 1, true) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Cannot parse version string '%s'"),
lines[0]);

2
src/openvz/openvz_conf.c
View File

@ -86,7 +86,7 @@ openvzExtractVersionInfo(const char *cmdstr, int *retversion)
if ((tmp = STRSKIP(tmp, "vzctl version ")) == NULL)
return -1;
if (virParseVersionString(tmp, &version, true) < 0)
if (virStringParseVersion(&version, tmp, true) < 0)
return -1;
if (retversion)

2
src/util/virdnsmasq.c
View File

@ -615,7 +615,7 @@ dnsmasqCapsSetFromBuffer(dnsmasqCaps *caps, const char *buf)
virSkipToDigit(&p);
if (virParseVersionString(p, &version, true) < 0)
if (virStringParseVersion(&version, p, true) < 0)
goto error;
if (version < DNSMASQ_MIN_MAJOR * 1000000 + DNSMASQ_MIN_MINOR * 1000) {

2
src/util/virfirewalld.c
View File

@ -108,7 +108,7 @@ virFirewallDGetVersion(unsigned long *version)
g_variant_get(reply, "(v)", &gvar);
g_variant_get(gvar, "&s", &versionStr);
if (virParseVersionString(versionStr, version, false) < 0) {
if (virStringParseVersion(version, versionStr, false) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Failed to parse firewalld version '%s'"),
versionStr);

7
src/util/virstring.c
View File

@ -1022,9 +1022,9 @@ int virStringParseYesNo(const char *str, bool *result)
/**
* virParseVersionString:
* @str: const char pointer to the version string
* virStringParseVersion:
* @version: unsigned long pointer to output the version number
* @str: const char pointer to the version string
* @allowMissing: true to treat 3 like 3.0.0, false to error out on
* missing minor or micro
*
@ -1038,7 +1038,8 @@ int virStringParseYesNo(const char *str, bool *result)
* Returns the 0 for success, -1 for error.
*/
int
virParseVersionString(const char *str, unsigned long *version,
virStringParseVersion(unsigned long *version,
const char *str,
bool allowMissing)
{
unsigned int major, minor = 0, micro = 0;

4
src/util/virstring.h
View File

@ -136,6 +136,6 @@ int virStringParseYesNo(const char *str,
bool *result)
G_GNUC_WARN_UNUSED_RESULT;
int virParseVersionString(const char *str,
unsigned long *version,
int virStringParseVersion(unsigned long *version,
const char *str,
bool allowMissing);

2
src/vbox/vbox_common.c
View File

@ -170,7 +170,7 @@ vboxExtractVersion(void)
gVBoxAPI.UPFN.Utf16ToUtf8(vbox_driver->pFuncs, versionUtf16, &vboxVersion);
if (virParseVersionString(vboxVersion, &vbox_driver->version, false) >= 0)
if (virStringParseVersion(&vbox_driver->version, vboxVersion, false) >= 0)
ret = 0;
gVBoxAPI.UPFN.Utf8Free(vbox_driver->pFuncs, vboxVersion);

2
src/vmware/vmware_conf.c
View File

@ -230,7 +230,7 @@ vmwareParseVersionStr(int type, const char *verbuf, unsigned long *version)
return -1;
}
if (virParseVersionString(tmp, version, false) < 0) {
if (virStringParseVersion(version, tmp, false) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("version parsing error"));
return -1;

2
src/vz/vz_utils.c
View File

@ -182,7 +182,7 @@ vzInitVersion(struct _vzDriver *driver)
}
tmp[0] = '\0';
if (virParseVersionString(sVer, &(driver->vzVersion), true) < 0) {
if (virStringParseVersion(&(driver->vzVersion), sVer, true) < 0) {
vzParseError();
goto cleanup;
}

2
tests/testutilsqemu.c
View File

@ -696,7 +696,7 @@ testQemuGetLatestCapsForArch(const char *arch,
if (!virStringStripSuffix(tmp, fullsuffix))
continue;
if (virParseVersionString(tmp, &ver, false) < 0) {
if (virStringParseVersion(&ver, tmp, false) < 0) {
VIR_TEST_DEBUG("skipping caps file '%s'", ent->d_name);
continue;
}

2
tests/utiltest.c
View File

@ -151,7 +151,7 @@ testParseVersionString(const void *data G_GNUC_UNUSED)
unsigned long version;
for (i = 0; i < G_N_ELEMENTS(versions); ++i) {
result = virParseVersionString(versions[i].string, &version,
result = virStringParseVersion(&version, versions[i].string,
versions[i].allowMissing);
if (result != versions[i].result) {

2
tools/virt-host-validate-common.c
View File

@ -267,7 +267,7 @@ int virHostValidateLinuxKernel(const char *hvname,
return VIR_HOST_VALIDATE_FAILURE(level);
}
if (virParseVersionString(uts.release, &thisversion, true) < 0) {
if (virStringParseVersion(&thisversion, uts.release, true) < 0) {
virHostMsgFail(level, "%s", hint);
return VIR_HOST_VALIDATE_FAILURE(level);
}