NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

po: avoid spurious double spaces in messages

Browse Source 
Noticed during the recent error cleanups.

* src/network/bridge_driver.c (networkStartRadvd): Fix spacing.
* src/openvz/openvz_conf.c (openvzReadMemConf): Likewise.
* src/qemu/qemu_command.c (qemuNetworkIfaceConnect): Likewise.
* src/qemu/qemu_hotplug.c (qemuDomainDetachNetDevice): Likewise.
* src/qemu/qemu_process.c (qemuProcessStop): Likewise.
* src/security/virt-aa-helper.c (vah_add_file): Likewise.
This commit is contained in:
Eric Blake 2012-07-18 17:45:34 -06:00
parent 68a97bd85f
commit 99f1faf777
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/bridge_driver.c
View File

@ -850,7 +850,7 @@ networkStartRadvd(virNetworkObjPtr network)
prefix = virNetworkIpDefPrefix(ipdef); prefix = virNetworkIpDefPrefix(ipdef);
if (prefix < 0) { if (prefix < 0) {
networkReportError(VIR_ERR_INTERNAL_ERROR, networkReportError(VIR_ERR_INTERNAL_ERROR,
_("bridge '%s' has an invalid prefix"), _("bridge '%s' has an invalid prefix"),
network->def->bridge); network->def->bridge);
goto cleanup; goto cleanup;
} }

2
src/openvz/openvz_conf.c
View File

@ -511,7 +511,7 @@ openvzReadMemConf(virDomainDefPtr def, int veid)
ret = openvzParseBarrierLimit(temp, &barrier, NULL); ret = openvzParseBarrierLimit(temp, &barrier, NULL);
if (ret < 0) { if (ret < 0) {
openvzError(VIR_ERR_INTERNAL_ERROR, openvzError(VIR_ERR_INTERNAL_ERROR,
_("Could not parse barrier of '%s' " _("Could not parse barrier of '%s' "
"from config for container %d"), param, veid); "from config for container %d"), param, veid);
goto error; goto error;
} }

2
src/qemu/qemu_command.c
View File

@ -265,7 +265,7 @@ qemuNetworkIfaceConnect(virDomainDefPtr def,
if (driver->macFilter) { if (driver->macFilter) {
if ((err = networkAllowMacOnPort(driver, net->ifname, &net->mac))) { if ((err = networkAllowMacOnPort(driver, net->ifname, &net->mac))) {
virReportSystemError(err, virReportSystemError(err,
_("failed to add ebtables rule to allow MAC address on '%s'"), _("failed to add ebtables rule to allow MAC address on '%s'"),
net->ifname); net->ifname);
} }
} }

2
src/qemu/qemu_hotplug.c
View File

@ -2293,7 +2293,7 @@ qemuDomainDetachNetDevice(struct qemud_driver *driver,
detach->ifname, detach->ifname,
&detach->mac))) { &detach->mac))) {
virReportSystemError(errno, virReportSystemError(errno,
_("failed to remove ebtables rule on '%s'"), _("failed to remove ebtables rule on '%s'"),
detach->ifname); detach->ifname);
} }
} }

2
src/qemu/qemu_process.c
View File

@ -4029,7 +4029,7 @@ void qemuProcessStop(struct qemud_driver *driver,
if ((errno = networkDisallowMacOnPort(driver, net->ifname, if ((errno = networkDisallowMacOnPort(driver, net->ifname,
&net->mac))) { &net->mac))) {
virReportSystemError(errno, virReportSystemError(errno,
_("failed to remove ebtables rule to allow MAC address on '%s'"), _("failed to remove ebtables rule to allow MAC address on '%s'"),
net->ifname); net->ifname);
} }
} }

8
src/security/virt-aa-helper.c
View File

@ -2,7 +2,7 @@
/* /*
* virt-aa-helper: wrapper program used by AppArmor security driver. * virt-aa-helper: wrapper program used by AppArmor security driver.
* *
* Copyright (C) 2010-2011 Red Hat, Inc. * Copyright (C) 2010-2012 Red Hat, Inc.
* Copyright (C) 2009-2011 Canonical Ltd. * Copyright (C) 2009-2011 Canonical Ltd.
* *
* See COPYING.LIB for the License of this software * See COPYING.LIB for the License of this software
@ -762,14 +762,14 @@ vah_add_file(virBufferPtr buf, const char *path, const char *perms)
*/ */
if (STRNEQLEN(path, "/", 1)) { if (STRNEQLEN(path, "/", 1)) {
vah_warning(path); vah_warning(path);
vah_warning(_(" skipped non-absolute path")); vah_warning(_("skipped non-absolute path"));
return 0; return 0;
} }
if (virFileExists(path)) { if (virFileExists(path)) {
if ((tmp = realpath(path, NULL)) == NULL) { if ((tmp = realpath(path, NULL)) == NULL) {
vah_error(NULL, 0, path); vah_error(NULL, 0, path);
vah_error(NULL, 0, _(" could not find realpath for disk")); vah_error(NULL, 0, _("could not find realpath for disk"));
return rc; return rc;
} }
} else } else
@ -783,7 +783,7 @@ vah_add_file(virBufferPtr buf, const char *path, const char *perms)
if (rc != 0) { if (rc != 0) {
if (rc > 0) { if (rc > 0) {
vah_error(NULL, 0, path); vah_error(NULL, 0, path);
vah_error(NULL, 0, _(" skipped restricted file")); vah_error(NULL, 0, _("skipped restricted file"));
} }
goto clean; goto clean;
} }