Error messages are exempt from the 80 columns rule. Move them
onto one line.
Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx>
---
src/util/vircgroupv2devices.c | 13 ++++---------
src/util/vircommand.c | 3 +--
src/util/virfile.c | 3 +--
src/util/virhostcpu.c | 3 +--
src/util/virhostmem.c | 6 ++----
src/util/virjson.c | 3 +--
src/util/virmdev.c | 3 +--
src/util/virnetdev.c | 12 ++++--------
src/util/virnetdevbandwidth.c | 6 ++----
src/util/virnetdevopenvswitch.c | 6 ++----
src/util/virnetdevvportprofile.c | 6 ++----
src/util/virnetlink.c | 3 +--
src/util/virnuma.c | 6 ++----
src/util/virpci.c | 3 +--
src/util/virprocess.c | 9 +++------
src/util/virqemu.c | 3 +--
src/util/virresctrl.c | 9 +++------
src/util/virthreadpool.c | 3 +--
18 files changed, 33 insertions(+), 67 deletions(-)
diff --git a/src/util/vircgroupv2devices.c b/src/util/vircgroupv2devices.c
index f740127bbc..7deb233c06 100644
--- a/src/util/vircgroupv2devices.c
+++ b/src/util/vircgroupv2devices.c
@@ -444,9 +444,7 @@ virCgroupV2DevicesCreateMap(size_t size)
if (mapfd < 0) {
if (errno == EPERM) {
virReportSystemError(errno, "%s",
- _("failed to initialize device BPF map; "
- "locked memory limit for libvirtd probably "
- "needs to be raised"));
+ _("failed to initialize device BPF map; locked memory limit for libvirtd probably needs to be raised"));
return -1;
} else {
virReportSystemError(errno, "%s",
@@ -595,8 +593,7 @@ int
virCgroupV2DevicesDetectProg(virCgroup *group G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
- _("cgroups v2 BPF devices not supported "
- "with this kernel"));
+ _("cgroups v2 BPF devices not supported with this kernel"));
return -1;
}
@@ -605,8 +602,7 @@ int
virCgroupV2DevicesCreateProg(virCgroup *group G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
- _("cgroups v2 BPF devices not supported "
- "with this kernel"));
+ _("cgroups v2 BPF devices not supported with this kernel"));
return -1;
}
@@ -615,8 +611,7 @@ int
virCgroupV2DevicesPrepareProg(virCgroup *group G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
- _("cgroups v2 BPF devices not supported "
- "with this kernel"));
+ _("cgroups v2 BPF devices not supported with this kernel"));
return -1;
}
diff --git a/src/util/vircommand.c b/src/util/vircommand.c
index 5f094c625a..704069815a 100644
--- a/src/util/vircommand.c
+++ b/src/util/vircommand.c
@@ -2691,8 +2691,7 @@ virCommandRunAsync(virCommand *cmd, pid_t *pid)
virCommandDoAsyncIOHelper,
"cmd-async-io", false, cmd) < 0) {
virReportSystemError(errno, "%s",
- _("Unable to create thread "
- "to process command's IO"));
+ _("Unable to create thread to process command's IO"));
VIR_FREE(cmd->asyncioThread);
virCommandAbort(cmd);
ret = -1;
diff --git a/src/util/virfile.c b/src/util/virfile.c
index 0600e4a172..bd36a9a31a 100644
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -1094,8 +1094,7 @@ virFileNBDLoadDriver(void)
{
if (virKModIsProhibited(NBD_DRIVER)) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("Failed to load nbd module: "
- "administratively prohibited"));
+ _("Failed to load nbd module: administratively prohibited"));
return false;
} else {
g_autofree char *errbuf = NULL;
diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c
index a15731e9ea..0389012ef7 100644
--- a/src/util/virhostcpu.c
+++ b/src/util/virhostcpu.c
@@ -892,8 +892,7 @@ virHostCPUStatsAssign(virNodeCPUStatsPtr param,
{
if (virStrcpyStatic(param->field, name) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
- "%s", _("kernel cpu time field is too long"
- " for the destination"));
+ "%s", _("kernel cpu time field is too long for the destination"));
return -1;
}
param->value = value;
diff --git a/src/util/virhostmem.c b/src/util/virhostmem.c
index 83c10206cd..1da2759ac3 100644
--- a/src/util/virhostmem.c
+++ b/src/util/virhostmem.c
@@ -392,8 +392,7 @@ virHostMemSetParameters(virTypedParameterPtr params G_GNUC_UNUSED,
virCheckFlags(0, -1);
virReportError(VIR_ERR_NO_SUPPORT, "%s",
- _("node set memory parameters not implemented"
- " on this platform"));
+ _("node set memory parameters not implemented on this platform"));
return -1;
}
#endif
@@ -586,8 +585,7 @@ virHostMemGetParameters(virTypedParameterPtr params G_GNUC_UNUSED,
virCheckFlags(VIR_TYPED_PARAM_STRING_OKAY, -1);
virReportError(VIR_ERR_NO_SUPPORT, "%s",
- _("node get memory parameters not implemented"
- " on this platform"));
+ _("node get memory parameters not implemented on this platform"));
return -1;
}
#endif
diff --git a/src/util/virjson.c b/src/util/virjson.c
index 7e20443f93..03c3b6cfb9 100644
--- a/src/util/virjson.c
+++ b/src/util/virjson.c
@@ -1938,8 +1938,7 @@ virJSONValueObjectDeflattenWorker(const char *key,
} else {
if (!virJSONValueIsObject(existobj)) {
virReportError(VIR_ERR_INVALID_ARG, "%s",
- _("mixing nested objects and values is forbidden in "
- "JSON deflattening"));
+ _("mixing nested objects and values is forbidden in JSON deflattening"));
return -1;
}
}
diff --git a/src/util/virmdev.c b/src/util/virmdev.c
index d0f35ca347..992f3eb1b7 100644
--- a/src/util/virmdev.c
+++ b/src/util/virmdev.c
@@ -167,8 +167,7 @@ virMediatedDeviceNew(const char *uuidstr G_GNUC_UNUSED,
virMediatedDeviceModelType model G_GNUC_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("mediated devices are not supported on non-linux "
- "platforms"));
+ _("mediated devices are not supported on non-linux platforms"));
return NULL;
}
diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
index 46d90fbd76..8ae854245e 100644
--- a/src/util/virnetdev.c
+++ b/src/util/virnetdev.c
@@ -182,8 +182,7 @@ virNetDevSetupControl(const char *ifname G_GNUC_UNUSED,
void *ifr G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
- _("Network device configuration is not supported "
- "on this platform"));
+ _("Network device configuration is not supported on this platform"));
return -1;
}
#endif /* WITH_STRUCT_IFREQ */
@@ -2248,8 +2247,7 @@ virNetDevSetNetConfig(const char *linkdev, int vf,
if (vlan) {
if (vlan->nTags != 1 || vlan->trunk) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("vlan trunking is not supported "
- "by SR-IOV network devices"));
+ _("vlan trunking is not supported by SR-IOV network devices"));
return -1;
}
@@ -2651,8 +2649,7 @@ int virNetDevAddMulti(const char *ifname G_GNUC_UNUSED,
virMacAddr *macaddr G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
- _("Unable to add address to interface "
- "multicast list on this platform"));
+ _("Unable to add address to interface multicast list on this platform"));
return -1;
}
#endif
@@ -2696,8 +2693,7 @@ int virNetDevDelMulti(const char *ifname G_GNUC_UNUSED,
virMacAddr *macaddr G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
- _("Unable to delete address from interface "
- "multicast list on this platform"));
+ _("Unable to delete address from interface multicast list on this platform"));
return -1;
}
#endif
diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c
index 52fb94a9fc..ec41666f67 100644
--- a/src/util/virnetdevbandwidth.c
+++ b/src/util/virnetdevbandwidth.c
@@ -208,15 +208,13 @@ virNetDevBandwidthSet(const char *ifname,
if (geteuid() != 0) {
virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
- _("Network bandwidth tuning is not available"
- " in session mode"));
+ _("Network bandwidth tuning is not available in session mode"));
return -1;
}
if (!ifname) {
virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
- _("Unable to set bandwidth for interface because "
- "device name is unknown"));
+ _("Unable to set bandwidth for interface because device name is unknown"));
return -1;
}
diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c
index dbdd645f8e..8dad6ed2bd 100644
--- a/src/util/virnetdevopenvswitch.c
+++ b/src/util/virnetdevopenvswitch.c
@@ -894,15 +894,13 @@ virNetDevOpenvswitchInterfaceSetQos(const char *ifname,
if (geteuid() != 0) {
virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
- _("Network bandwidth tuning is not available"
- " in session mode"));
+ _("Network bandwidth tuning is not available in session mode"));
return -1;
}
if (!ifname) {
virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
- _("Unable to set bandwidth for interface because "
- "device name is unknown"));
+ _("Unable to set bandwidth for interface because device name is unknown"));
return -1;
}
diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c
index cf92f1838b..33bcd350c4 100644
--- a/src/util/virnetdevvportprofile.c
+++ b/src/util/virnetdevvportprofile.c
@@ -530,8 +530,7 @@ virNetDevVPortProfileGetStatus(struct nlattr **tb, int32_t vf,
if (nla_type(tb_vf_ports) != IFLA_VF_PORT) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("error while iterating over "
- "IFLA_VF_PORTS part"));
+ _("error while iterating over IFLA_VF_PORTS part"));
return -1;
}
@@ -584,8 +583,7 @@ virNetDevVPortProfileGetStatus(struct nlattr **tb, int32_t vf,
if (nla_parse_nested(tb_port, IFLA_PORT_MAX, tb_vf_ports,
ifla_port_policy)) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("error parsing IFLA_VF_PORT "
- "during error reporting"));
+ _("error parsing IFLA_VF_PORT during error reporting"));
return -1;
}
if (tb_port[IFLA_PORT_INSTANCE_UUID]) {
diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c
index 2d052cd03e..24cd69a385 100644
--- a/src/util/virnetlink.c
+++ b/src/util/virnetlink.c
@@ -225,8 +225,7 @@ virNetlinkCreateSocket(int protocol)
if (virNetlinkSetBufferSize(nlhandle, 131702, 0) < 0) {
virReportSystemError(errno, "%s",
- _("cannot set netlink socket buffer "
- "size to 128k"));
+ _("cannot set netlink socket buffer size to 128k"));
goto error;
}
nl_socket_enable_msg_peek(nlhandle);
diff --git a/src/util/virnuma.c b/src/util/virnuma.c
index e8bbaf0947..5053a70c61 100644
--- a/src/util/virnuma.c
+++ b/src/util/virnuma.c
@@ -69,8 +69,7 @@ virNumaGetAutoPlacementAdvice(unsigned short vcpus,
if (virCommandRun(cmd, NULL) < 0) {
virReportError(VIR_ERR_OPERATION_FAILED, "%s",
- _("Failed to query numad for the "
- "advisory nodeset"));
+ _("Failed to query numad for the advisory nodeset"));
VIR_FREE(output);
}
@@ -149,8 +148,7 @@ virNumaSetupMemoryPolicy(virDomainNumatuneMemMode mode,
if (!has_preferred_many && nnodes != 1) {
virReportError(VIR_ERR_INTERNAL_ERROR,
- "%s", _("NUMA memory tuning in 'preferred' mode "
- "only supports single node"));
+ "%s", _("NUMA memory tuning in 'preferred' mode only supports single node"));
return -1;
}
diff --git a/src/util/virpci.c b/src/util/virpci.c
index 1158e468bf..08b82708b1 100644
--- a/src/util/virpci.c
+++ b/src/util/virpci.c
@@ -1454,8 +1454,7 @@ virPCIDeviceAddressIsValid(virPCIDeviceAddress *addr,
if (virPCIDeviceAddressIsEmpty(addr)) {
if (report)
virReportError(VIR_ERR_XML_ERROR, "%s",
- _("Invalid PCI address 0000:00:00, at least "
- "one of domain, bus, or slot must be > 0"));
+ _("Invalid PCI address 0000:00:00, at least one of domain, bus, or slot must be > 0"));
return false;
}
return true;
diff --git a/src/util/virprocess.c b/src/util/virprocess.c
index f8daa786c9..7c0f63efbb 100644
--- a/src/util/virprocess.c
+++ b/src/util/virprocess.c
@@ -1621,15 +1621,13 @@ virProcessSetScheduler(pid_t pid,
if ((min = sched_get_priority_min(pol)) < 0) {
virReportSystemError(errno, "%s",
- _("Cannot get minimum scheduler "
- "priority value"));
+ _("Cannot get minimum scheduler priority value"));
return -1;
}
if ((max = sched_get_priority_max(pol)) < 0) {
virReportSystemError(errno, "%s",
- _("Cannot get maximum scheduler "
- "priority value"));
+ _("Cannot get maximum scheduler priority value"));
return -1;
}
@@ -1664,8 +1662,7 @@ virProcessSetScheduler(pid_t pid G_GNUC_UNUSED,
return 0;
virReportSystemError(ENOSYS, "%s",
- _("Process CPU scheduling is not supported "
- "on this platform"));
+ _("Process CPU scheduling is not supported on this platform"));
return -1;
}
diff --git a/src/util/virqemu.c b/src/util/virqemu.c
index b9e57a6f4c..c9fac5956a 100644
--- a/src/util/virqemu.c
+++ b/src/util/virqemu.c
@@ -207,8 +207,7 @@ virQEMUBuildCommandLineJSONRecurse(const char *key,
case VIR_JSON_TYPE_ARRAY:
if (nested) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("nested JSON array to commandline conversion is "
- "not supported"));
+ _("nested JSON array to commandline conversion is not supported"));
return -1;
}
diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c
index 1e98b111f2..8ca58f5d10 100644
--- a/src/util/virresctrl.c
+++ b/src/util/virresctrl.c
@@ -496,8 +496,7 @@ static int
virResctrlLock(void)
{
virReportSystemError(ENOSYS, "%s",
- _("resctrl locking is not supported "
- "on this platform"));
+ _("resctrl locking is not supported on this platform"));
return -1;
}
@@ -506,8 +505,7 @@ static int
virResctrlUnlock(int fd G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
- _("resctrl locking is not supported "
- "on this platform"));
+ _("resctrl locking is not supported on this platform"));
return -1;
}
@@ -1468,8 +1466,7 @@ virResctrlAllocParseMemoryBandwidthLine(virResctrlInfo *resctrl,
!resctrl->membw_info->min_bandwidth ||
!resctrl->membw_info->bandwidth_granularity) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("Missing or inconsistent resctrl info for "
- "memory bandwidth allocation"));
+ _("Missing or inconsistent resctrl info for memory bandwidth allocation"));
return -1;
}
diff --git a/src/util/virthreadpool.c b/src/util/virthreadpool.c
index 2f1d49d665..d45fa92061 100644
--- a/src/util/virthreadpool.c
+++ b/src/util/virthreadpool.c
@@ -429,8 +429,7 @@ virThreadPoolSetParameters(virThreadPool *pool,
if ((maxWorkers == 0 && pool->maxWorkers > 0) ||
(maxWorkers > 0 && pool->maxWorkers == 0)) {
virReportError(VIR_ERR_INVALID_ARG, "%s",
- _("maxWorkers must not be switched from zero to non-zero"
- " and vice versa"));
+ _("maxWorkers must not be switched from zero to non-zero and vice versa"));
return -1;
}
--
2.41.0
