3:38 a.m.
This patch just fixes misaligned arguments and misaligned conditions
of src/util/*.c.
Signed-off-by: Shi Lei <shi_lei(a)massclouds.com>
---
src/util/vircgroup.c | 34 +++++++++---------
src/util/virconf.c | 4 +--
src/util/virdbus.c | 2 +-
src/util/virdnsmasq.c | 5 +--
src/util/virerror.c | 2 +-
src/util/virevent.c | 14 ++++----
src/util/vireventpoll.c | 8 ++---
src/util/virfile.c | 6 ++--
src/util/virgic.c | 2 +-
src/util/virhook.c | 2 +-
src/util/virhostdev.c | 23 ++++++------
src/util/viridentity.c | 18 +++++-----
src/util/viriscsi.c | 22 ++++++------
src/util/virjson.c | 2 +-
src/util/virkeycode.c | 22 ++++++------
src/util/virkeyfile.c | 6 ++--
src/util/virlockspace.c | 2 +-
src/util/virlog.c | 18 +++++-----
src/util/virnetdev.c | 4 +--
src/util/virnetdevbridge.c | 2 +-
src/util/virnetdevip.c | 11 +++---
src/util/virnetdevmacvlan.c | 30 ++++++++--------
src/util/virnetdevopenvswitch.c | 34 +++++++++---------
src/util/virnetdevvportprofile.c | 24 ++++++-------
src/util/virnetlink.c | 10 +++---
src/util/virobject.c | 2 +-
src/util/virpci.c | 4 +--
src/util/virperf.c | 4 +--
src/util/virprocess.c | 2 +-
src/util/virqemu.c | 4 +--
src/util/virresctrl.c | 7 ++--
src/util/virsocketaddr.c | 2 +-
src/util/virstorageencryption.c | 2 +-
src/util/virstoragefile.c | 60 ++++++++++++++------------------
src/util/virsysinfo.c | 2 +-
src/util/viruri.c | 2 +-
src/util/virutil.c | 2 +-
src/util/virxml.c | 2 +-
38 files changed, 197 insertions(+), 205 deletions(-)
diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
index 64507bf..ab5ff6d 100644
--- a/src/util/vircgroup.c
+++ b/src/util/vircgroup.c
@@ -2066,9 +2066,9 @@ virCgroupSetBlkioDeviceReadIops(virCgroupPtr group,
return -1;
return virCgroupSetValueStr(group,
- VIR_CGROUP_CONTROLLER_BLKIO,
- "blkio.throttle.read_iops_device",
- str);
+ VIR_CGROUP_CONTROLLER_BLKIO,
+ "blkio.throttle.read_iops_device",
+ str);
}
@@ -2095,9 +2095,9 @@ virCgroupSetBlkioDeviceWriteIops(virCgroupPtr group,
return -1;
return virCgroupSetValueStr(group,
- VIR_CGROUP_CONTROLLER_BLKIO,
- "blkio.throttle.write_iops_device",
- str);
+ VIR_CGROUP_CONTROLLER_BLKIO,
+ "blkio.throttle.write_iops_device",
+ str);
}
@@ -2124,9 +2124,9 @@ virCgroupSetBlkioDeviceReadBps(virCgroupPtr group,
return -1;
return virCgroupSetValueStr(group,
- VIR_CGROUP_CONTROLLER_BLKIO,
- "blkio.throttle.read_bps_device",
- str);
+ VIR_CGROUP_CONTROLLER_BLKIO,
+ "blkio.throttle.read_bps_device",
+ str);
}
/**
@@ -2152,9 +2152,9 @@ virCgroupSetBlkioDeviceWriteBps(virCgroupPtr group,
return -1;
return virCgroupSetValueStr(group,
- VIR_CGROUP_CONTROLLER_BLKIO,
- "blkio.throttle.write_bps_device",
- str);
+ VIR_CGROUP_CONTROLLER_BLKIO,
+ "blkio.throttle.write_bps_device",
+ str);
}
@@ -2182,9 +2182,9 @@ virCgroupSetBlkioDeviceWeight(virCgroupPtr group,
return -1;
return virCgroupSetValueStr(group,
- VIR_CGROUP_CONTROLLER_BLKIO,
- "blkio.weight_device",
- str);
+ VIR_CGROUP_CONTROLLER_BLKIO,
+ "blkio.weight_device",
+ str);
}
/**
@@ -3218,8 +3218,8 @@ virCgroupGetPercpuStats(virCgroupPtr group,
goto cleanup;
for (i = start_cpu; i < need_cpus; i++) {
- if (virTypedParameterAssign(¶ms[(i - start_cpu) * nparams +
- param_idx],
+ int idx = (i - start_cpu) * nparams + param_idx;
+ if (virTypedParameterAssign(¶ms[idx],
VIR_DOMAIN_CPU_STATS_VCPUTIME,
VIR_TYPED_PARAM_ULLONG,
sum_cpu_time[i]) < 0)
diff --git a/src/util/virconf.c b/src/util/virconf.c
index e0a3fd1..217ca89 100644
--- a/src/util/virconf.c
+++ b/src/util/virconf.c
@@ -463,7 +463,7 @@ virConfParseValue(virConfParserCtxtPtr ctxt)
return NULL;
}
if ((CUR == '"') || (CUR == '\'') ||
- (ctxt->conf->flags & VIR_CONF_FLAG_LXC_FORMAT)) {
+ (ctxt->conf->flags & VIR_CONF_FLAG_LXC_FORMAT)) {
type = VIR_CONF_STRING;
str = virConfParseString(ctxt);
if (str == NULL)
@@ -1428,7 +1428,7 @@ int virConfWalk(virConfPtr conf,
cur = conf->entries;
while (cur != NULL) {
if (cur->name && cur->value &&
- callback(cur->name, cur->value, opaque) < 0)
+ callback(cur->name, cur->value, opaque) < 0)
return -1;
cur = cur->next;
}
diff --git a/src/util/virdbus.c b/src/util/virdbus.c
index ba8b684..05b1f6c 100644
--- a/src/util/virdbus.c
+++ b/src/util/virdbus.c
@@ -1567,7 +1567,7 @@ virDBusCall(DBusConnection *conn,
ret = 0;
} else {
virReportError(VIR_ERR_DBUS_SERVICE, _("%s: %s"), member,
- localerror.message ? localerror.message : _("unknown error"));
+ localerror.message ? : _("unknown error"));
}
goto cleanup;
}
diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c
index 7872b6e..50f40c8 100644
--- a/src/util/virdnsmasq.c
+++ b/src/util/virdnsmasq.c
@@ -605,8 +605,9 @@ dnsmasqReload(pid_t pid ATTRIBUTE_UNUSED)
#ifndef WIN32
if (kill(pid, SIGHUP) != 0) {
virReportSystemError(errno,
- _("Failed to make dnsmasq (PID: %d) reload config files."),
- pid);
+ _("Failed to make dnsmasq (PID: %d)"
+ " reload config files."),
+ pid);
return -1;
}
#endif /* WIN32 */
diff --git a/src/util/virerror.c b/src/util/virerror.c
index 4688e01..a796035 100644
--- a/src/util/virerror.c
+++ b/src/util/virerror.c
@@ -139,7 +139,7 @@ VIR_ENUM_IMPL(virErrorDomain, VIR_ERR_DOMAIN_LAST,
"Perf", /* 65 */
"Libssh transport layer",
"Resource control",
- )
+ )
/*
diff --git a/src/util/virevent.c b/src/util/virevent.c
index 87069e3..8211348 100644
--- a/src/util/virevent.c
+++ b/src/util/virevent.c
@@ -286,14 +286,12 @@ int virEventRegisterDefaultImpl(void)
return -1;
}
- virEventRegisterImpl(
- virEventPollAddHandle,
- virEventPollUpdateHandle,
- virEventPollRemoveHandle,
- virEventPollAddTimeout,
- virEventPollUpdateTimeout,
- virEventPollRemoveTimeout
- );
+ virEventRegisterImpl(virEventPollAddHandle,
+ virEventPollUpdateHandle,
+ virEventPollRemoveHandle,
+ virEventPollAddTimeout,
+ virEventPollUpdateTimeout,
+ virEventPollRemoveTimeout);
return 0;
}
diff --git a/src/util/vireventpoll.c b/src/util/vireventpoll.c
index 2fe58c7..ebe7e5c 100644
--- a/src/util/vireventpoll.c
+++ b/src/util/vireventpoll.c
@@ -545,10 +545,10 @@ static void virEventPollCleanupTimeouts(void)
}
if ((i+1) < eventLoop.timeoutsCount) {
+ size_t count = eventLoop.timeoutsCount - (i+1);
memmove(eventLoop.timeouts+i,
eventLoop.timeouts+i+1,
- sizeof(struct virEventPollTimeout)*(eventLoop.timeoutsCount
- -(i+1)));
+ sizeof(struct virEventPollTimeout)*count);
}
eventLoop.timeoutsCount--;
}
@@ -594,10 +594,10 @@ static void virEventPollCleanupHandles(void)
}
if ((i+1) < eventLoop.handlesCount) {
+ size_t count = eventLoop.handlesCount - (i+1);
memmove(eventLoop.handles+i,
eventLoop.handles+i+1,
- sizeof(struct virEventPollHandle)*(eventLoop.handlesCount
- -(i+1)));
+ sizeof(struct virEventPollHandle)*count);
}
eventLoop.handlesCount--;
}
diff --git a/src/util/virfile.c b/src/util/virfile.c
index af45a51..34d3213 100644
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -304,7 +304,7 @@ virFileWrapperFdNew(int *fd ATTRIBUTE_UNUSED,
unsigned int fdflags ATTRIBUTE_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("virFileWrapperFd unsupported on this platform"));
+ _("virFileWrapperFd unsupported on this platform"));
return NULL;
}
#endif
@@ -658,7 +658,7 @@ static int virFileLoopDeviceOpenLoopCtl(char **dev_name, int *fd)
if ((*fd = open(looppath, O_RDWR)) < 0) {
virReportSystemError(errno,
- _("Unable to open %s"), looppath);
+ _("Unable to open %s"), looppath);
VIR_FREE(looppath);
return -1;
}
@@ -3484,7 +3484,7 @@ virFileIsSharedFSType(const char *path,
if ((p = strrchr(dirpath, '/')) == NULL) {
virReportSystemError(EINVAL,
- _("Invalid relative path '%s'"), path);
+ _("Invalid relative path '%s'"),
path);
return -1;
}
diff --git a/src/util/virgic.c b/src/util/virgic.c
index e7326d6..6f26659 100644
--- a/src/util/virgic.c
+++ b/src/util/virgic.c
@@ -30,4 +30,4 @@ VIR_ENUM_IMPL(virGICVersion, VIR_GIC_VERSION_LAST,
"host",
"2",
"3",
-);
+ );
diff --git a/src/util/virhook.c b/src/util/virhook.c
index 993f06d..431222b 100644
--- a/src/util/virhook.c
+++ b/src/util/virhook.c
@@ -251,7 +251,7 @@ virHookCall(int driver,
if ((virHooksFound == -1) ||
((driver == VIR_HOOK_DRIVER_DAEMON) &&
(op == VIR_HOOK_DAEMON_OP_RELOAD ||
- op == VIR_HOOK_DAEMON_OP_SHUTDOWN)))
+ op == VIR_HOOK_DAEMON_OP_SHUTDOWN)))
virHookInitialize();
if ((virHooksFound & (1 << driver)) == 0)
diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c
index ca79c37..b3278a8 100644
--- a/src/util/virhostdev.c
+++ b/src/util/virhostdev.c
@@ -322,7 +322,7 @@ virHostdevNetDevice(virDomainHostdevDefPtr hostdev,
if (!linkdev) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("The device at %s has no network device name"),
- sysfs_path);
+ sysfs_path);
return -1;
}
@@ -540,13 +540,12 @@ virHostdevRestoreNetConfig(virDomainHostdevDefPtr hostdev,
if (virHostdevNetDevice(hostdev, 0, &linkdev, &vf) < 0)
return -1;
- virtPort = virDomainNetGetActualVirtPortProfile(
- hostdev->parent.data.net);
+ virtPort = virDomainNetGetActualVirtPortProfile(hostdev->parent.data.net);
if (virtPort) {
return virHostdevNetConfigVirtPortProfile(linkdev, vf, virtPort,
-
&hostdev->parent.data.net->mac,
- NULL,
- port_profile_associate);
+
&hostdev->parent.data.net->mac,
+ NULL,
+ port_profile_associate);
} else {
/* we need to try 3 different places for the config file:
* 1) ${stateDir}/${PF}_vf${vf}
@@ -770,7 +769,7 @@ virHostdevPreparePCIDevices(virHostdevManagerPtr mgr,
} else {
virReportError(VIR_ERR_OPERATION_INVALID,
_("Unmanaged PCI device %s must be manually "
- "detached from the host"),
+ "detached from the host"),
virPCIDeviceGetName(pci));
goto reattachdevs;
}
@@ -1920,8 +1919,8 @@ virHostdevReAttachSCSIHostDevices(virHostdevManagerPtr mgr,
}
VIR_DEBUG("Removing %s:%u:%u:%llu dom=%s from activeSCSIHostdevs",
- scsihostsrc->adapter, scsihostsrc->bus, scsihostsrc->target,
- scsihostsrc->unit, dom_name);
+ scsihostsrc->adapter, scsihostsrc->bus, scsihostsrc->target,
+ scsihostsrc->unit, dom_name);
virSCSIDeviceListDel(mgr->activeSCSIHostdevs, tmp,
drv_name, dom_name);
@@ -2008,7 +2007,7 @@ virHostdevReAttachSCSIVHostDevices(virHostdevManagerPtr mgr,
if (STREQ_NULLABLE(drv_name, usedby_drvname) &&
STREQ_NULLABLE(dom_name, usedby_domname)) {
VIR_DEBUG("Removing %s dom=%s from activeSCSIVHostHostdevs",
- hostsrc->wwpn, dom_name);
+ hostsrc->wwpn, dom_name);
virSCSIVHostDeviceListDel(mgr->activeSCSIVHostHostdevs, tmp);
}
@@ -2173,8 +2172,8 @@ virHostdevPrepareDomainDevices(virHostdevManagerPtr mgr,
if (flags & VIR_HOSTDEV_SP_USB) {
if (virHostdevPrepareUSBDevices(mgr, driver, def->name,
- def->hostdevs, def->nhostdevs,
- flags) < 0)
+ def->hostdevs, def->nhostdevs,
+ flags) < 0)
return -1;
}
diff --git a/src/util/viridentity.c b/src/util/viridentity.c
index c621444..e7637b5 100644
--- a/src/util/viridentity.c
+++ b/src/util/viridentity.c
@@ -242,7 +242,7 @@ int virIdentitySetAttr(virIdentityPtr ident,
if (ident->attrs[attr]) {
virReportError(VIR_ERR_OPERATION_DENIED, "%s",
- _("Identity attribute is already set"));
+ _("Identity attribute is already set"));
goto cleanup;
}
@@ -463,8 +463,8 @@ int virIdentitySetUNIXUserID(virIdentityPtr ident,
return -1;
return virIdentitySetAttr(ident,
- VIR_IDENTITY_ATTR_UNIX_USER_ID,
- val);
+ VIR_IDENTITY_ATTR_UNIX_USER_ID,
+ val);
}
@@ -486,8 +486,8 @@ int virIdentitySetUNIXGroupID(virIdentityPtr ident,
return -1;
return virIdentitySetAttr(ident,
- VIR_IDENTITY_ATTR_UNIX_GROUP_ID,
- val);
+ VIR_IDENTITY_ATTR_UNIX_GROUP_ID,
+ val);
}
@@ -500,8 +500,8 @@ int virIdentitySetUNIXProcessID(virIdentityPtr ident,
return -1;
return virIdentitySetAttr(ident,
- VIR_IDENTITY_ATTR_UNIX_PROCESS_ID,
- val);
+ VIR_IDENTITY_ATTR_UNIX_PROCESS_ID,
+ val);
}
@@ -514,8 +514,8 @@ int virIdentitySetUNIXProcessTime(virIdentityPtr ident,
return -1;
return virIdentitySetAttr(ident,
- VIR_IDENTITY_ATTR_UNIX_PROCESS_TIME,
- val);
+ VIR_IDENTITY_ATTR_UNIX_PROCESS_TIME,
+ val);
}
diff --git a/src/util/viriscsi.c b/src/util/viriscsi.c
index 0fcedc8..f8345c7 100644
--- a/src/util/viriscsi.c
+++ b/src/util/viriscsi.c
@@ -92,7 +92,7 @@ virISCSIGetSession(const char *devpath,
VIR_AUTOFREE(char *) error = NULL;
VIR_AUTOPTR(virCommand) cmd = virCommandNewArgList(ISCSIADM, "--mode",
- "session", NULL);
+ "session", NULL);
virCommandSetErrorBuffer(cmd, &error);
if (virCommandRunRegex(cmd,
@@ -127,7 +127,7 @@ virStorageBackendIQNFound(const char *initiatoriqn,
VIR_AUTOFREE(char *) iface = NULL;
VIR_AUTOFREE(char *) iqn = NULL;
VIR_AUTOPTR(virCommand) cmd = virCommandNewArgList(ISCSIADM,
- "--mode", "iface",
NULL);
+ "--mode",
"iface", NULL);
*ifacename = NULL;
@@ -351,10 +351,10 @@ int
virISCSIRescanLUNs(const char *session)
{
VIR_AUTOPTR(virCommand) cmd = virCommandNewArgList(ISCSIADM,
- "--mode", "session",
- "-r", session,
- "-R",
- NULL);
+ "--mode",
"session",
+ "-r", session,
+ "-R",
+ NULL);
return virCommandRun(cmd, NULL);
}
@@ -406,10 +406,10 @@ virISCSIScanTargetsInternal(const char *portal,
struct virISCSITargetList list;
size_t i;
VIR_AUTOPTR(virCommand) cmd = virCommandNewArgList(ISCSIADM,
- "--mode", "discovery",
- "--type",
"sendtargets",
- "--portal", portal,
- NULL);
+ "--mode",
"discovery",
+ "--type",
"sendtargets",
+ "--portal", portal,
+ NULL);
if (!persist) {
virCommandAddArgList(cmd,
@@ -496,7 +496,7 @@ virISCSIScanTargets(const char *portal,
}
return virISCSIScanTargetsInternal(portal, ifacename,
- persist, ntargets, targets);
+ persist, ntargets, targets);
}
diff --git a/src/util/virjson.c b/src/util/virjson.c
index 0f16086..78f868a 100644
--- a/src/util/virjson.c
+++ b/src/util/virjson.c
@@ -1898,7 +1898,7 @@ virJSONValueToStringOne(virJSONValuePtr object,
if (yajl_gen_string(g,
(unsigned char *)object->data.object.pairs[i].key,
strlen(object->data.object.pairs[i].key))
- != yajl_gen_status_ok)
+ != yajl_gen_status_ok)
return -1;
if (virJSONValueToStringOne(object->data.object.pairs[i].value, g) <
0)
return -1;
diff --git a/src/util/virkeycode.c b/src/util/virkeycode.c
index 8976bbf..1135872 100644
--- a/src/util/virkeycode.c
+++ b/src/util/virkeycode.c
@@ -70,17 +70,17 @@ verify(VIR_KEYMAP_ENTRY_MAX ==
ARRAY_CARDINALITY(virKeyNameTable_osx));
verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyNameTable_win32));
VIR_ENUM_IMPL(virKeycodeSet, VIR_KEYCODE_SET_LAST,
- "linux",
- "xt",
- "atset1",
- "atset2",
- "atset3",
- "os_x",
- "xt_kbd",
- "usb",
- "win32",
- "qnum",
-);
+ "linux",
+ "xt",
+ "atset1",
+ "atset2",
+ "atset3",
+ "os_x",
+ "xt_kbd",
+ "usb",
+ "win32",
+ "qnum",
+ );
int virKeycodeValueFromString(virKeycodeSet codeset,
const char *keyname)
diff --git a/src/util/virkeyfile.c b/src/util/virkeyfile.c
index da06425..88ae2a5 100644
--- a/src/util/virkeyfile.c
+++ b/src/util/virkeyfile.c
@@ -334,7 +334,7 @@ void virKeyFileFree(virKeyFilePtr conf)
bool virKeyFileHasGroup(virKeyFilePtr conf,
- const char *groupname)
+ const char *groupname)
{
VIR_DEBUG("conf=%p groupname=%s", conf, groupname);
return virHashLookup(conf->groups, groupname) != NULL;
@@ -342,8 +342,8 @@ bool virKeyFileHasGroup(virKeyFilePtr conf,
bool virKeyFileHasValue(virKeyFilePtr conf,
- const char *groupname,
- const char *valuename)
+ const char *groupname,
+ const char *valuename)
{
virHashTablePtr group = virHashLookup(conf->groups, groupname);
VIR_DEBUG("conf=%p groupname=%s valuename=%s", conf, groupname,
valuename);
diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c
index 60bfef4..79fa48d 100644
--- a/src/util/virlockspace.c
+++ b/src/util/virlockspace.c
@@ -269,7 +269,7 @@ virLockSpacePtr virLockSpaceNew(const char *directory)
if (!virFileIsDir(directory)) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Lockspace location %s exists, but is not a
directory"),
- directory);
+ directory);
goto error;
}
} else {
diff --git a/src/util/virlog.c b/src/util/virlog.c
index 64c0efc..17f25dd 100644
--- a/src/util/virlog.c
+++ b/src/util/virlog.c
@@ -634,23 +634,23 @@ virLogVMessage(virLogSourcePtr source,
char *initmsg = NULL;
if (virLogVersionString(&rawinitmsg, &initmsg) >= 0)
virLogOutputs[i]->f(&virLogSelf, VIR_LOG_INFO,
- __FILE__, __LINE__, __func__,
- timestamp, NULL, 0, rawinitmsg, initmsg,
- virLogOutputs[i]->data);
+ __FILE__, __LINE__, __func__,
+ timestamp, NULL, 0, rawinitmsg, initmsg,
+ virLogOutputs[i]->data);
VIR_FREE(initmsg);
if (virLogHostnameString(&hoststr, &initmsg) >= 0)
virLogOutputs[i]->f(&virLogSelf, VIR_LOG_INFO,
- __FILE__, __LINE__, __func__,
- timestamp, NULL, 0, hoststr, initmsg,
- virLogOutputs[i]->data);
+ __FILE__, __LINE__, __func__,
+ timestamp, NULL, 0, hoststr, initmsg,
+ virLogOutputs[i]->data);
VIR_FREE(hoststr);
VIR_FREE(initmsg);
virLogOutputs[i]->logInitMessage = false;
}
virLogOutputs[i]->f(source, priority,
- filename, linenr, funcname,
- timestamp, metadata, filterflags,
- str, msg, virLogOutputs[i]->data);
+ filename, linenr, funcname,
+ timestamp, metadata, filterflags,
+ str, msg, virLogOutputs[i]->data);
}
}
if (virLogNbOutputs == 0) {
diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
index 39c9131..dde9ced 100644
--- a/src/util/virnetdev.c
+++ b/src/util/virnetdev.c
@@ -1079,7 +1079,7 @@ virNetDevSysfsFile(char **pf_sysfs_device_link, const char *ifname,
static int
virNetDevSysfsDeviceFile(char **pf_sysfs_device_link, const char *ifname,
- const char *file)
+ const char *file)
{
if (virAsprintf(pf_sysfs_device_link, SYSFS_NET_DIR "%s/device/%s",
ifname,
file) < 0)
@@ -2717,7 +2717,7 @@ static int virNetDevParseMcast(char *buf, virNetDevMcastEntryPtr
mcast)
break;
case VIR_MCAST_TYPE_ADDR_TOKEN:
if (virMacAddrParseHex((const char*)token,
- &mcast->macaddr) < 0) {
+ &mcast->macaddr) < 0) {
virReportSystemError(EINVAL,
_("Failed to parse MAC address from
'%s'"),
buf);
diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c
index e02d1ad..071ebb7 100644
--- a/src/util/virnetdevbridge.c
+++ b/src/util/virnetdevbridge.c
@@ -642,7 +642,7 @@ int virNetDevBridgeRemovePort(const char *brname,
}
#elif defined(HAVE_BSD_BRIDGE_MGMT)
int virNetDevBridgeRemovePort(const char *brname,
- const char *ifname)
+ const char *ifname)
{
struct ifbreq req;
diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c
index 103ff9e..9f940e1 100644
--- a/src/util/virnetdevip.c
+++ b/src/util/virnetdevip.c
@@ -404,7 +404,7 @@ virNetDevIPParseDadStatus(struct nlmsghdr *nlh, int len,
VIR_WARNINGS_NO_CAST_ALIGN
rtattr_ptr = (struct rtattr *) IFA_RTA(ifaddrmsg_ptr);
for (; RTA_OK(rtattr_ptr, ifaddrmsg_len);
- rtattr_ptr = RTA_NEXT(rtattr_ptr, ifaddrmsg_len)) {
+ rtattr_ptr = RTA_NEXT(rtattr_ptr, ifaddrmsg_len)) {
VIR_WARNINGS_RESET
if (RTA_PAYLOAD(rtattr_ptr) != sizeof(struct in6_addr)) {
/* No address: ignore. */
@@ -660,9 +660,10 @@ virNetDevIPAddrAdd(const char *ifname,
return -1;
/* format up a broadcast address if this is IPv4 */
- if (!peerstr && ((VIR_SOCKET_ADDR_IS_FAMILY(addr, AF_INET)) &&
- ((virSocketAddrBroadcastByPrefix(addr, prefix, &broadcast) < 0) ||
- !(bcaststr = virSocketAddrFormat(&broadcast))))) {
+ if (!peerstr &&
+ ((VIR_SOCKET_ADDR_IS_FAMILY(addr, AF_INET)) &&
+ ((virSocketAddrBroadcastByPrefix(addr, prefix, &broadcast) < 0) ||
+ !(bcaststr = virSocketAddrFormat(&broadcast))))) {
return -1;
}
@@ -749,7 +750,7 @@ virNetDevIPRouteAdd(const char *ifname,
virCommandAddArgList(cmd, "route", "add", NULL);
virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix);
virCommandAddArgList(cmd, "via", gatewaystr, "dev", ifname,
- "proto", "static", "metric",
NULL);
+ "proto", "static", "metric",
NULL);
virCommandAddArgFormat(cmd, "%u", metric);
if (virCommandRun(cmd, NULL) < 0)
diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c
index a6b726f..0a9abbf 100644
--- a/src/util/virnetdevmacvlan.c
+++ b/src/util/virnetdevmacvlan.c
@@ -602,25 +602,25 @@ virNetDevMacVLanVPortProfileCallback(struct nlmsghdr *hdr,
case RTM_GETLINK:
VIR_DEBUG(" IFINFOMSG");
VIR_DEBUG(" ifi_family = 0x%02x",
- ((struct ifinfomsg *)data)->ifi_family);
+ ((struct ifinfomsg *)data)->ifi_family);
VIR_DEBUG(" ifi_type = 0x%x",
- ((struct ifinfomsg *)data)->ifi_type);
+ ((struct ifinfomsg *)data)->ifi_type);
VIR_DEBUG(" ifi_index = %i",
- ((struct ifinfomsg *)data)->ifi_index);
+ ((struct ifinfomsg *)data)->ifi_index);
VIR_DEBUG(" ifi_flags = 0x%04x",
- ((struct ifinfomsg *)data)->ifi_flags);
+ ((struct ifinfomsg *)data)->ifi_flags);
VIR_DEBUG(" ifi_change = 0x%04x",
- ((struct ifinfomsg *)data)->ifi_change);
+ ((struct ifinfomsg *)data)->ifi_change);
}
/* DEBUG end */
/* Parse netlink message assume a setlink with vfports */
memcpy(&ifinfo, NLMSG_DATA(hdr), sizeof(ifinfo));
VIR_DEBUG("family:%#x type:%#x index:%d flags:%#x change:%#x",
- ifinfo.ifi_family, ifinfo.ifi_type, ifinfo.ifi_index,
- ifinfo.ifi_flags, ifinfo.ifi_change);
+ ifinfo.ifi_family, ifinfo.ifi_type, ifinfo.ifi_index,
+ ifinfo.ifi_flags, ifinfo.ifi_change);
if (nlmsg_parse(hdr, sizeof(ifinfo),
- (struct nlattr **)&tb, IFLA_MAX, NULL)) {
+ (struct nlattr **)&tb, IFLA_MAX, NULL)) {
VIR_DEBUG("error parsing request...");
return;
}
@@ -631,13 +631,13 @@ virNetDevMacVLanVPortProfileCallback(struct nlmsghdr *hdr,
nla_for_each_nested(tb_vfinfo_list, tb[IFLA_VFINFO_LIST], rem) {
if (nla_type(tb_vfinfo_list) != IFLA_VF_INFO) {
VIR_DEBUG("nested parsing of"
- "IFLA_VFINFO_LIST failed.");
+ "IFLA_VFINFO_LIST failed.");
return;
}
if (nla_parse_nested(tb_vfinfo, IFLA_VF_MAX,
- tb_vfinfo_list, ifla_vf_policy)) {
+ tb_vfinfo_list, ifla_vf_policy)) {
VIR_DEBUG("nested parsing of "
- "IFLA_VF_INFO failed.");
+ "IFLA_VF_INFO failed.");
return;
}
}
@@ -691,7 +691,7 @@ virNetDevMacVLanVPortProfileCallback(struct nlmsghdr *hdr,
continue;
}
if (nla_parse_nested(tb3, IFLA_PORT_MAX, tb_vf_ports,
- ifla_port_policy)) {
+ ifla_port_policy)) {
VIR_DEBUG("nested parsing on level 2"
" failed.");
}
@@ -742,8 +742,8 @@ virNetDevMacVLanVPortProfileCallback(struct nlmsghdr *hdr,
}
if (tb3[IFLA_PORT_RESPONSE]) {
- VIR_DEBUG("IFLA_PORT_RESPONSE = %d", *(uint16_t *)
- RTA_DATA(tb3[IFLA_PORT_RESPONSE]));
+ VIR_DEBUG("IFLA_PORT_RESPONSE = %d",
+ *(uint16_t *) RTA_DATA(tb3[IFLA_PORT_RESPONSE]));
}
}
}
@@ -1106,7 +1106,7 @@ int virNetDevMacVLanDeleteWithVPortProfile(const char *ifname,
if ((virNetDevReadNetConfig(linkdev, -1, stateDir,
&adminMAC, &vlan, &MAC) == 0) &&
- (adminMAC || vlan || MAC)) {
+ (adminMAC || vlan || MAC)) {
ignore_value(virNetDevSetNetConfig(linkdev, -1,
adminMAC, vlan, MAC, !!vlan));
diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c
index a5de541..b2756f9 100644
--- a/src/util/virnetdevopenvswitch.c
+++ b/src/util/virnetdevopenvswitch.c
@@ -139,10 +139,10 @@ virNetDevOpenvswitchConstructVlans(virCommandPtr cmd,
virNetDevVlanPtr virtVlan)
* Returns 0 in case of success or -1 in case of failure.
*/
int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname,
- const virMacAddr *macaddr,
- const unsigned char *vmuuid,
- virNetDevVPortProfilePtr ovsport,
- virNetDevVlanPtr virtVlan)
+ const virMacAddr *macaddr,
+ const unsigned char *vmuuid,
+ virNetDevVPortProfilePtr ovsport,
+ virNetDevVlanPtr virtVlan)
{
char macaddrstr[VIR_MAC_STRING_BUFLEN];
char ifuuidstr[VIR_UUID_STRING_BUFLEN];
@@ -182,21 +182,21 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char
*ifname,
if (ovsport->profileID[0] == '\0') {
virCommandAddArgList(cmd,
- "--", "set", "Interface", ifname,
attachedmac_ex_id,
- "--", "set", "Interface", ifname,
ifaceid_ex_id,
- "--", "set", "Interface", ifname,
vmid_ex_id,
- "--", "set", "Interface", ifname,
- "external-ids:iface-status=active",
- NULL);
+ "--", "set", "Interface",
ifname, attachedmac_ex_id,
+ "--", "set", "Interface",
ifname, ifaceid_ex_id,
+ "--", "set", "Interface",
ifname, vmid_ex_id,
+ "--", "set", "Interface",
ifname,
+ "external-ids:iface-status=active",
+ NULL);
} else {
virCommandAddArgList(cmd,
- "--", "set", "Interface", ifname,
attachedmac_ex_id,
- "--", "set", "Interface", ifname,
ifaceid_ex_id,
- "--", "set", "Interface", ifname,
vmid_ex_id,
- "--", "set", "Interface", ifname,
profile_ex_id,
- "--", "set", "Interface", ifname,
- "external-ids:iface-status=active",
- NULL);
+ "--", "set", "Interface",
ifname, attachedmac_ex_id,
+ "--", "set", "Interface",
ifname, ifaceid_ex_id,
+ "--", "set", "Interface",
ifname, vmid_ex_id,
+ "--", "set", "Interface",
ifname, profile_ex_id,
+ "--", "set", "Interface",
ifname,
+ "external-ids:iface-status=active",
+ NULL);
}
if (virCommandRun(cmd, NULL) < 0) {
diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c
index 215d649..b6cd0e6 100644
--- a/src/util/virnetdevvportprofile.c
+++ b/src/util/virnetdevvportprofile.c
@@ -813,8 +813,8 @@ virNetDevVPortProfileOpSetLink(const char *ifname, int ifindex,
if (err->error) {
virReportSystemError(-err->error,
- _("error during virtual port configuration of ifindex %d"),
- ifindex);
+ _("error during virtual port configuration of
ifindex %d"),
+ ifindex);
goto cleanup;
}
break;
@@ -979,9 +979,9 @@ virNetDevVPortProfileOpCommon(const char *ifname, int ifindex,
/* keep trying... */
} else {
virReportSystemError(EINVAL,
- _("error %d during port-profile setlink on "
- "interface %s (%d)"),
- status, ifname, ifindex);
+ _("error %d during port-profile setlink on "
+ "interface %s (%d)"),
+ status, ifname, ifindex);
rc = -1;
break;
}
@@ -1347,13 +1347,13 @@ virNetDevVPortProfileDisassociate(const char *macvtap_ifname,
#else /* ! WITH_VIRTUALPORT */
int virNetDevVPortProfileAssociate(const char *macvtap_ifname ATTRIBUTE_UNUSED,
- const virNetDevVPortProfile *virtPort ATTRIBUTE_UNUSED,
- const virMacAddr *macvtap_macaddr ATTRIBUTE_UNUSED,
- const char *linkdev ATTRIBUTE_UNUSED,
- int vf ATTRIBUTE_UNUSED,
- const unsigned char *vmuuid ATTRIBUTE_UNUSED,
- virNetDevVPortProfileOp vmOp ATTRIBUTE_UNUSED,
- bool setlink_only ATTRIBUTE_UNUSED)
+ const virNetDevVPortProfile *virtPort
ATTRIBUTE_UNUSED,
+ const virMacAddr *macvtap_macaddr ATTRIBUTE_UNUSED,
+ const char *linkdev ATTRIBUTE_UNUSED,
+ int vf ATTRIBUTE_UNUSED,
+ const unsigned char *vmuuid ATTRIBUTE_UNUSED,
+ virNetDevVPortProfileOp vmOp ATTRIBUTE_UNUSED,
+ bool setlink_only ATTRIBUTE_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Virtual port profile association not supported on this
platform"));
diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c
index e473ccb..bf36899 100644
--- a/src/util/virnetlink.c
+++ b/src/util/virnetlink.c
@@ -543,9 +543,9 @@ virNetlinkNewLink(const char *ifname,
NETLINK_MSG_PUT(nl_msg, IFLA_INFO_KIND, (strlen(type) + 1), type);
if ((STREQ(type, "macvtap") || STREQ(type, "macvlan"))
&&
- extra_args &&
- extra_args->macvlan_mode &&
- *extra_args->macvlan_mode > 0) {
+ extra_args &&
+ extra_args->macvlan_mode &&
+ *extra_args->macvlan_mode > 0) {
NETLINK_MSG_NEST_START(nl_msg, infodata, IFLA_INFO_DATA);
NETLINK_MSG_PUT(nl_msg, IFLA_MACVLAN_MODE,
sizeof(uint32_t), extra_args->macvlan_mode);
@@ -871,7 +871,7 @@ virNetlinkEventCallback(int watch,
virNetlinkEventServerLock(srv);
VIR_DEBUG("dispatching to max %d clients, called from event watch %d",
- (int)srv->handlesCount, watch);
+ (int)srv->handlesCount, watch);
for (i = 0; i < srv->handlesCount; i++) {
if (srv->handles[i].deleted != VIR_NETLINK_HANDLE_VALID)
@@ -1143,7 +1143,7 @@ virNetlinkEventAddClient(virNetlinkEventHandleCallback handleCB,
VIR_DEBUG("Used %zu handle slots, adding at least %d more",
srv->handlesAlloc, NETLINK_EVENT_ALLOC_EXTENT);
if (VIR_RESIZE_N(srv->handles, srv->handlesAlloc,
- srv->handlesCount, NETLINK_EVENT_ALLOC_EXTENT) < 0)
+ srv->handlesCount, NETLINK_EVENT_ALLOC_EXTENT) < 0)
goto error;
}
r = srv->handlesCount++;
diff --git a/src/util/virobject.c b/src/util/virobject.c
index a597ff4..b6ea299 100644
--- a/src/util/virobject.c
+++ b/src/util/virobject.c
@@ -60,7 +60,7 @@ struct _virClass {
obj, obj->u.s.magic); \
} else { \
VIR_WARN("Object %p (%s) is not a %s instance", \
- anyobj, obj->klass->name, #objclass); \
+ anyobj, obj->klass->name, #objclass); \
} \
} while (0)
diff --git a/src/util/virpci.c b/src/util/virpci.c
index fb3f04f..6164d7d 100644
--- a/src/util/virpci.c
+++ b/src/util/virpci.c
@@ -60,13 +60,13 @@ VIR_ENUM_IMPL(virPCIStubDriver, VIR_PCI_STUB_DRIVER_LAST,
"pciback", /* XEN */
"pci-stub", /* KVM */
"vfio-pci", /* VFIO */
-);
+ );
VIR_ENUM_IMPL(virPCIHeader, VIR_PCI_HEADER_LAST,
"endpoint",
"pci-bridge",
"cardbus-bridge",
-);
+ );
struct _virPCIDevice {
virPCIDeviceAddress address;
diff --git a/src/util/virperf.c b/src/util/virperf.c
index 23f7703..fe51681 100644
--- a/src/util/virperf.c
+++ b/src/util/virperf.c
@@ -212,8 +212,8 @@ virPerfEventEnable(virPerfPtr perf,
return 0;
if (event_attr->attrType == 0 && (type == VIR_PERF_EVENT_CMT ||
- type == VIR_PERF_EVENT_MBMT ||
- type == VIR_PERF_EVENT_MBML)) {
+ type == VIR_PERF_EVENT_MBMT ||
+ type == VIR_PERF_EVENT_MBML)) {
virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED,
_("unable to enable host cpu perf event for %s"),
virPerfEventTypeToString(type));
diff --git a/src/util/virprocess.c b/src/util/virprocess.c
index 3988f55..c749e5f 100644
--- a/src/util/virprocess.c
+++ b/src/util/virprocess.c
@@ -702,7 +702,7 @@ int virProcessSetNamespaces(size_t nfdlist,
if (nfdlist == 0) {
virReportInvalidArg(nfdlist, "%s",
- _("Expected at least one file descriptor"));
+ _("Expected at least one file descriptor"));
return -1;
}
for (i = 0; i < nfdlist; i++) {
diff --git a/src/util/virqemu.c b/src/util/virqemu.c
index 13ad741..115109c 100644
--- a/src/util/virqemu.c
+++ b/src/util/virqemu.c
@@ -117,10 +117,10 @@ virQEMUBuildCommandLineJSONIterate(const char *key,
return -1;
return virQEMUBuildCommandLineJSONRecurse(tmpkey, value, data->buf,
- data->arrayFunc, false);
+ data->arrayFunc, false);
} else {
return virQEMUBuildCommandLineJSONRecurse(key, value, data->buf,
- data->arrayFunc, false);
+ data->arrayFunc, false);
}
}
diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c
index 4b5442f..8635228 100644
--- a/src/util/virresctrl.c
+++ b/src/util/virresctrl.c
@@ -702,7 +702,7 @@ virResctrlInfoGetCache(virResctrlInfoPtr resctrl,
virReportError(VIR_ERR_INTERNAL_ERROR,
_("level %u cache size %llu does not match "
"expected size %llu"),
- level, i_type->size, size);
+ level, i_type->size, size);
goto error;
}
i_type->max_cache_id++;
@@ -1430,9 +1430,8 @@ virResctrlAllocGetGroup(virResctrlInfoPtr resctrl,
{
char *schemata = NULL;
int rv = virFileReadValueString(&schemata,
- SYSFS_RESCTRL_PATH
- "/%s/schemata",
- groupname);
+ SYSFS_RESCTRL_PATH "/%s/schemata",
+ groupname);
*alloc = NULL;
diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c
index eee725d..6f7da53 100644
--- a/src/util/virsocketaddr.c
+++ b/src/util/virsocketaddr.c
@@ -1168,7 +1168,7 @@ virSocketAddrIsNumericLocalhost(const char *addr)
switch (res.data.stor.ss_family) {
case AF_INET:
return memcmp(&res.data.inet4.sin_addr.s_addr, &tmp.s_addr,
- sizeof(res.data.inet4.sin_addr.s_addr)) == 0;
+ sizeof(res.data.inet4.sin_addr.s_addr)) == 0;
case AF_INET6:
return IN6_IS_ADDR_LOOPBACK(&res.data.inet6.sin6_addr);
}
diff --git a/src/util/virstorageencryption.c b/src/util/virstorageencryption.c
index 77c46fa..80962ed 100644
--- a/src/util/virstorageencryption.c
+++ b/src/util/virstorageencryption.c
@@ -300,7 +300,7 @@ virStorageEncryptionParseNode(xmlNodePtr node,
/* If no cipher node, then fail */
if (!encdef->encinfo.cipher_name) {
virReportError(VIR_ERR_XML_ERROR, "%s",
- _("ivgen element found, but cipher is
missing"));
+ _("ivgen element found, but cipher is
missing"));
goto cleanup;
}
diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index 927223e..1dabc88 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -459,8 +459,7 @@ qcow2GetBackingStoreFormat(int *format,
case QCOW2_HDR_EXTENSION_BACKING_FORMAT:
if (buf[offset+len] != '\0')
break;
- *format = virStorageFileFormatTypeFromString(
- ((const char *)buf)+offset);
+ *format = virStorageFileFormatTypeFromString(buf+offset);
if (*format <= VIR_STORAGE_FILE_NONE)
return -1;
}
@@ -828,16 +827,14 @@ virStorageFileProbeFormatFromBuf(const char *path,
/* First check file magic */
for (i = 0; i < VIR_STORAGE_FILE_LAST; i++) {
- if (virStorageFileMatchesMagic(
- fileTypeInfo[i].magicOffset,
- fileTypeInfo[i].magic,
- buf, buflen)) {
- if (!virStorageFileMatchesVersion(
- fileTypeInfo[i].versionOffset,
- fileTypeInfo[i].versionSize,
- fileTypeInfo[i].versionNumbers,
- fileTypeInfo[i].endian,
- buf, buflen)) {
+ if (virStorageFileMatchesMagic(fileTypeInfo[i].magicOffset,
+ fileTypeInfo[i].magic,
+ buf, buflen)) {
+ if (!virStorageFileMatchesVersion(fileTypeInfo[i].versionOffset,
+ fileTypeInfo[i].versionSize,
+ fileTypeInfo[i].versionNumbers,
+ fileTypeInfo[i].endian,
+ buf, buflen)) {
possibleFormat = i;
continue;
}
@@ -853,8 +850,7 @@ virStorageFileProbeFormatFromBuf(const char *path,
/* No magic, so check file extension */
for (i = 0; i < VIR_STORAGE_FILE_LAST; i++) {
- if (virStorageFileMatchesExtension(
- fileTypeInfo[i].extension, path)) {
+ if (virStorageFileMatchesExtension(fileTypeInfo[i].extension, path)) {
format = i;
goto cleanup;
}
@@ -1040,8 +1036,8 @@ virStorageFileGetMetadataInternal(virStorageSourcePtr meta,
VIR_FREE(meta->backingStoreRaw);
if (fileTypeInfo[meta->format].getBackingStore != NULL) {
int store =
fileTypeInfo[meta->format].getBackingStore(&meta->backingStoreRaw,
- backingFormat,
- buf, len);
+ backingFormat,
+ buf, len);
if (store == BACKING_STORE_INVALID)
goto done;
@@ -1378,12 +1374,11 @@ int virStorageFileGetLVMKey(const char *path,
* 06UgP5-2rhb-w3Bo-3mdR-WeoL-pytO-SAa2ky
*/
int status;
- virCommandPtr cmd = virCommandNewArgList(
- LVS,
- "--noheadings", "--unbuffered", "--nosuffix",
- "--options", "uuid", path,
- NULL
- );
+ virCommandPtr cmd = virCommandNewArgList(LVS, "--noheadings",
+ "--unbuffered",
"--nosuffix",
+ "--options", "uuid",
path,
+ NULL
+ );
int ret = -1;
*key = NULL;
@@ -1438,13 +1433,12 @@ int virStorageFileGetSCSIKey(const char *path,
char **key)
{
int status;
- virCommandPtr cmd = virCommandNewArgList(
- "/lib/udev/scsi_id",
- "--replace-whitespace",
- "--whitelisted",
- "--device", path,
- NULL
- );
+ virCommandPtr cmd = virCommandNewArgList("/lib/udev/scsi_id",
+ "--replace-whitespace",
+ "--whitelisted",
+ "--device", path,
+ NULL
+ );
int ret = -1;
*key = NULL;
@@ -3708,9 +3702,9 @@ virStorageSourceUpdatePhysicalSize(virStorageSourcePtr src,
case VIR_STORAGE_TYPE_NONE:
case VIR_STORAGE_TYPE_LAST:
virReportError(VIR_ERR_INTERNAL_ERROR,
- _("cannot retrieve physical for path '%s' type
'%s'"),
- NULLSTR(src->path),
- virStorageTypeToString(actual_type));
+ _("cannot retrieve physical for path '%s' type
'%s'"),
+ NULLSTR(src->path),
+ virStorageTypeToString(actual_type));
return -1;
break;
}
@@ -4675,7 +4669,7 @@ virStorageFileGetUniqueIdentifier(virStorageSourcePtr src)
if (!src->drv->backend->storageFileGetUniqueIdentifier) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("unique storage file identifier not implemented for "
- "storage type %s (protocol: %s)'"),
+ "storage type %s (protocol: %s)'"),
virStorageTypeToString(src->type),
virStorageNetProtocolTypeToString(src->protocol));
return NULL;
diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c
index 5795d90..6731f74 100644
--- a/src/util/virsysinfo.c
+++ b/src/util/virsysinfo.c
@@ -1603,7 +1603,7 @@ virSysinfoBaseBoardIsEqual(virSysinfoBaseBoardDefPtr src,
static bool
virSysinfoChassisIsEqual(virSysinfoChassisDefPtr src,
- virSysinfoChassisDefPtr dst)
+ virSysinfoChassisDefPtr dst)
{
bool identical = false;
diff --git a/src/util/viruri.c b/src/util/viruri.c
index b80d924..d4b793f 100644
--- a/src/util/viruri.c
+++ b/src/util/viruri.c
@@ -342,7 +342,7 @@ virURIFindAliasMatch(char *const*aliases, const char *alias,
virReportError(VIR_ERR_CONF_SYNTAX,
_("Malformed 'uri_aliases' config entry
'%s', "
"aliases may only contain 'a-Z, 0-9, _,
-'"),
- *aliases);
+ *aliases);
return -1;
}
diff --git a/src/util/virutil.c b/src/util/virutil.c
index 0341c63..0a9b2c0 100644
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -325,7 +325,7 @@ virScaleInteger(unsigned long long *value, const char *suffix,
base = 1000;
} else {
virReportError(VIR_ERR_INVALID_ARG,
- _("unknown suffix '%s'"), suffix);
+ _("unknown suffix '%s'"), suffix);
return -1;
}
scale = 1;
diff --git a/src/util/virxml.c b/src/util/virxml.c
index d1926f4..bc0d4f2 100644
--- a/src/util/virxml.c
+++ b/src/util/virxml.c
@@ -1256,7 +1256,7 @@ virXMLValidatorInit(const char *schemafile)
goto error;
if (!(validator->rngParser =
- xmlRelaxNGNewParserCtxt(validator->schemafile))) {
+ xmlRelaxNGNewParserCtxt(validator->schemafile))) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Unable to create RNG parser for %s"),
validator->schemafile);
--
2.17.1