3:13 p.m.
We were 31/73 on whether to translate; since less than 50% translated
and since VIR_INFO is less than VIR_WARN which also doesn't translate,
this makes sense.
* cfg.mk (sc_prohibit_gettext_markup): Add VIR_INFO, since it
falls between WARN and DEBUG.
* daemon/libvirtd.c (qemudDispatchSignalEvent, remoteCheckAccess)
(qemudDispatchServer): Adjust offenders.
* daemon/remote.c (remoteDispatchAuthPolkit): Likewise.
* src/network/bridge_driver.c (networkReloadIptablesRules)
(networkStartNetworkDaemon, networkShutdownNetworkDaemon)
(networkCreate, networkDefine, networkUndefine): Likewise.
* src/qemu/qemu_driver.c (qemudDomainDefine)
(qemudDomainUndefine): Likewise.
* src/storage/storage_driver.c (storagePoolCreate)
(storagePoolDefine, storagePoolUndefine, storagePoolStart)
(storagePoolDestroy, storagePoolDelete, storageVolumeCreateXML)
(storageVolumeCreateXMLFrom, storageVolumeDelete): Likewise.
* src/util/bridge.c (brProbeVnetHdr): Likewise.
* po/POTFILES.in: Drop src/util/bridge.c.
---
I noticed this inconsistency while reviewing Lai's patch.
cfg.mk | 2 +-
daemon/libvirtd.c | 10 +++++-----
daemon/remote.c | 8 ++++----
po/POTFILES.in | 1 -
src/network/bridge_driver.c | 12 ++++++------
src/qemu/qemu_driver.c | 6 +++---
src/storage/storage_driver.c | 18 +++++++++---------
src/util/bridge.c | 18 +++++++++---------
8 files changed, 37 insertions(+), 38 deletions(-)
diff --git a/cfg.mk b/cfg.mk
index 1b60282..4fd6c98 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -524,7 +524,7 @@ sc_copyright_format:
# Some functions/macros produce messages intended solely for developers
# and maintainers. Do not mark them for translation.
sc_prohibit_gettext_markup:
- @prohibit='\<VIR_(WARN|DEBUG) *\(_\(' \
+ @prohibit='\<VIR_(WARN|INFO|DEBUG) *\(_\(' \
halt='do not mark these strings for translation' \
$(_sc_search_regexp)
diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index 900861a..6f470c2 100644
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -413,7 +413,7 @@ qemudDispatchSignalEvent(int watch ATTRIBUTE_UNUSED,
switch (siginfo.si_signo) {
case SIGHUP:
- VIR_INFO(_("Reloading configuration on SIGHUP"));
+ VIR_INFO("Reloading configuration on SIGHUP");
virHookCall(VIR_HOOK_DRIVER_DAEMON, "-",
VIR_HOOK_DAEMON_OP_RELOAD, SIGHUP, "SIGHUP", NULL);
if (virStateReload() < 0)
@@ -429,7 +429,7 @@ qemudDispatchSignalEvent(int watch ATTRIBUTE_UNUSED,
break;
default:
- VIR_INFO(_("Received unexpected signal %d"), siginfo.si_signo);
+ VIR_INFO("Received unexpected signal %d", siginfo.si_signo);
break;
}
@@ -1288,8 +1288,8 @@ remoteCheckAccess (struct qemud_client *client)
VIR_ERROR(_("remoteCheckCertificate: "
"failed to verify client's certificate"));
if (!tls_no_verify_certificate) return -1;
- else VIR_INFO(_("remoteCheckCertificate: tls_no_verify_certificate "
- "is set so the bad certificate is ignored"));
+ else VIR_INFO("remoteCheckCertificate: tls_no_verify_certificate "
+ "is set so the bad certificate is ignored");
}
if (client->tx) {
@@ -1445,7 +1445,7 @@ static int qemudDispatchServer(struct qemud_server *server, struct
qemud_socket
/* Client is running as root, so disable auth */
if (uid == 0) {
- VIR_INFO(_("Turn off polkit auth for privileged client pid %d from
%s"),
+ VIR_INFO("Turn off polkit auth for privileged client pid %d from
%s",
pid, client->addrstr);
client->auth = REMOTE_AUTH_NONE;
}
diff --git a/daemon/remote.c b/daemon/remote.c
index c2faf0f..1b424fe 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -2292,7 +2292,7 @@ remoteDispatchAuthPolkit(struct qemud_server *server,
goto authfail;
}
- VIR_INFO(_("Checking PID %d running as %d"), callerPid, callerUid);
+ VIR_INFO("Checking PID %d running as %d", callerPid, callerUid);
rv = snprintf(pidbuf, sizeof pidbuf, "%d", callerPid);
if (rv < 0 || rv >= sizeof pidbuf) {
@@ -2319,7 +2319,7 @@ remoteDispatchAuthPolkit(struct qemud_server *server,
}
PROBE(CLIENT_AUTH_ALLOW, "fd=%d, auth=%d, username=%s",
client->fd, REMOTE_AUTH_POLKIT, (char *)ident);
- VIR_INFO(_("Policy allowed action %s from pid %d, uid %d"),
+ VIR_INFO("Policy allowed action %s from pid %d, uid %d",
action, callerPid, callerUid);
ret->complete = 1;
client->auth = REMOTE_AUTH_NONE;
@@ -2390,7 +2390,7 @@ remoteDispatchAuthPolkit(struct qemud_server *server,
goto authfail;
}
- VIR_INFO(_("Checking PID %d running as %d"), callerPid, callerUid);
+ VIR_INFO("Checking PID %d running as %d", callerPid, callerUid);
dbus_error_init(&err);
if (!(pkcaller = polkit_caller_new_from_pid(server->sysbus,
callerPid, &err))) {
@@ -2450,7 +2450,7 @@ remoteDispatchAuthPolkit(struct qemud_server *server,
}
PROBE(CLIENT_AUTH_ALLOW, "fd=%d, auth=%d, username=%s",
client->fd, REMOTE_AUTH_POLKIT, ident);
- VIR_INFO(_("Policy allowed action %s from pid %d, uid %d, result %s"),
+ VIR_INFO("Policy allowed action %s from pid %d, uid %d, result %s",
action, callerPid, callerUid,
polkit_result_to_string_representation(pkresult));
ret->complete = 1;
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 96180d5..dd44da2 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -86,7 +86,6 @@ src/test/test_driver.c
src/uml/uml_conf.c
src/uml/uml_driver.c
src/util/authhelper.c
-src/util/bridge.c
src/util/cgroup.c
src/util/command.c
src/util/conf.c
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index feaedf4..d6030a4 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -1407,7 +1407,7 @@ networkReloadIptablesRules(struct network_driver *driver)
{
unsigned int i;
- VIR_INFO(_("Reloading iptables rules"));
+ VIR_INFO("Reloading iptables rules");
for (i = 0 ; i < driver->networks.count ; i++) {
virNetworkObjLock(driver->networks.objs[i]);
@@ -1752,7 +1752,7 @@ networkStartNetworkDaemon(struct network_driver *driver,
}
VIR_FREE(macTapIfName);
- VIR_INFO(_("Starting up network '%s'"), network->def->name);
+ VIR_INFO("Starting up network '%s'", network->def->name);
network->active = 1;
return 0;
@@ -1825,7 +1825,7 @@ static int networkShutdownNetworkDaemon(struct network_driver
*driver,
char *stateFile;
char *macTapIfName;
- VIR_INFO(_("Shutting down network '%s'"),
network->def->name);
+ VIR_INFO("Shutting down network '%s'", network->def->name);
if (!virNetworkObjIsActive(network))
return 0;
@@ -2127,7 +2127,7 @@ static virNetworkPtr networkCreate(virConnectPtr conn, const char
*xml) {
goto cleanup;
}
- VIR_INFO(_("Creating network '%s'"), network->def->name);
+ VIR_INFO("Creating network '%s'", network->def->name);
ret = virGetNetwork(conn, network->def->name, network->def->uuid);
cleanup:
@@ -2199,7 +2199,7 @@ static virNetworkPtr networkDefine(virConnectPtr conn, const char
*xml) {
dnsmasqContextFree(dctx);
}
- VIR_INFO(_("Defining network '%s'"), network->def->name);
+ VIR_INFO("Defining network '%s'", network->def->name);
ret = virGetNetwork(conn, network->def->name, network->def->uuid);
cleanup:
@@ -2286,7 +2286,7 @@ static int networkUndefine(virNetworkPtr net) {
}
- VIR_INFO(_("Undefining network '%s'"), network->def->name);
+ VIR_INFO("Undefining network '%s'", network->def->name);
virNetworkRemoveInactive(&driver->networks,
network);
network = NULL;
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index b368614..732c187 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -3757,7 +3757,7 @@ static virDomainPtr qemudDomainDefine(virConnectPtr conn, const char
*xml) {
if (virDomainSaveConfig(driver->configDir,
vm->newDef ? vm->newDef : vm->def) < 0) {
- VIR_INFO(_("Defining domain '%s'"), vm->def->name);
+ VIR_INFO("Defining domain '%s'", vm->def->name);
virDomainRemoveInactive(&driver->domains,
vm);
vm = NULL;
@@ -3770,7 +3770,7 @@ static virDomainPtr qemudDomainDefine(virConnectPtr conn, const char
*xml) {
VIR_DOMAIN_EVENT_DEFINED_ADDED :
VIR_DOMAIN_EVENT_DEFINED_UPDATED);
- VIR_INFO(_("Creating domain '%s'"), vm->def->name);
+ VIR_INFO("Creating domain '%s'", vm->def->name);
dom = virGetDomain(conn, vm->def->name, vm->def->uuid);
if (dom) dom->id = vm->def->id;
@@ -3820,7 +3820,7 @@ static int qemudDomainUndefine(virDomainPtr dom) {
VIR_DOMAIN_EVENT_UNDEFINED,
VIR_DOMAIN_EVENT_UNDEFINED_REMOVED);
- VIR_INFO(_("Undefining domain '%s'"), vm->def->name);
+ VIR_INFO("Undefining domain '%s'", vm->def->name);
virDomainRemoveInactive(&driver->domains,
vm);
vm = NULL;
diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
index 9328ca4..903ecee 100644
--- a/src/storage/storage_driver.c
+++ b/src/storage/storage_driver.c
@@ -551,7 +551,7 @@ storagePoolCreate(virConnectPtr conn,
pool = NULL;
goto cleanup;
}
- VIR_INFO(_("Creating storage pool '%s'"), pool->def->name);
+ VIR_INFO("Creating storage pool '%s'", pool->def->name);
pool->active = 1;
ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid);
@@ -593,7 +593,7 @@ storagePoolDefine(virConnectPtr conn,
}
def = NULL;
- VIR_INFO(_("Defining storage pool '%s'"), pool->def->name);
+ VIR_INFO("Defining storage pool '%s'", pool->def->name);
ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid);
cleanup:
@@ -643,7 +643,7 @@ storagePoolUndefine(virStoragePoolPtr obj) {
VIR_FREE(pool->configFile);
VIR_FREE(pool->autostartLink);
- VIR_INFO(_("Undefining storage pool '%s'"),
pool->def->name);
+ VIR_INFO("Undefining storage pool '%s'", pool->def->name);
virStoragePoolObjRemove(&driver->pools, pool);
pool = NULL;
ret = 0;
@@ -691,7 +691,7 @@ storagePoolStart(virStoragePoolPtr obj,
goto cleanup;
}
- VIR_INFO(_("Starting up storage pool '%s'"),
pool->def->name);
+ VIR_INFO("Starting up storage pool '%s'", pool->def->name);
pool->active = 1;
ret = 0;
@@ -779,7 +779,7 @@ storagePoolDestroy(virStoragePoolPtr obj) {
virStoragePoolObjClearVols(pool);
pool->active = 0;
- VIR_INFO(_("Shutting down storage pool '%s'"),
pool->def->name);
+ VIR_INFO("Shutting down storage pool '%s'",
pool->def->name);
if (pool->configFile == NULL) {
virStoragePoolObjRemove(&driver->pools, pool);
@@ -836,7 +836,7 @@ storagePoolDelete(virStoragePoolPtr obj,
}
if (backend->deletePool(obj->conn, pool, flags) < 0)
goto cleanup;
- VIR_INFO(_("Deleting storage pool '%s'"), pool->def->name);
+ VIR_INFO("Deleting storage pool '%s'", pool->def->name);
ret = 0;
cleanup:
@@ -1366,7 +1366,7 @@ storageVolumeCreateXML(virStoragePoolPtr obj,
}
- VIR_INFO(_("Creating volume '%s' in storage pool '%s'"),
+ VIR_INFO("Creating volume '%s' in storage pool '%s'",
volobj->name, pool->def->name);
ret = volobj;
volobj = NULL;
@@ -1526,7 +1526,7 @@ storageVolumeCreateXMLFrom(virStoragePoolPtr obj,
goto cleanup;
}
- VIR_INFO(_("Creating volume '%s' in storage pool '%s'"),
+ VIR_INFO("Creating volume '%s' in storage pool '%s'",
volobj->name, pool->def->name);
ret = volobj;
volobj = NULL;
@@ -1932,7 +1932,7 @@ storageVolumeDelete(virStorageVolPtr obj,
for (i = 0 ; i < pool->volumes.count ; i++) {
if (pool->volumes.objs[i] == vol) {
- VIR_INFO(_("Deleting volume '%s' from storage pool
'%s'"),
+ VIR_INFO("Deleting volume '%s' from storage pool
'%s'",
vol->name, pool->def->name);
virStorageVolDefFree(vol);
vol = NULL;
diff --git a/src/util/bridge.c b/src/util/bridge.c
index 98169ae..7204e64 100644
--- a/src/util/bridge.c
+++ b/src/util/bridge.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007, 2009 Red Hat, Inc.
+ * Copyright (C) 2007, 2009, 2011 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -428,14 +428,14 @@ brProbeVnetHdr(int tapfd)
struct ifreq dummy;
if (ioctl(tapfd, TUNGETFEATURES, &features) != 0) {
- VIR_INFO(_("Not enabling IFF_VNET_HDR; "
- "TUNGETFEATURES ioctl() not implemented"));
+ VIR_INFO("Not enabling IFF_VNET_HDR; "
+ "TUNGETFEATURES ioctl() not implemented");
return 0;
}
if (!(features & IFF_VNET_HDR)) {
- VIR_INFO(_("Not enabling IFF_VNET_HDR; "
- "TUNGETFEATURES ioctl() reports no IFF_VNET_HDR"));
+ VIR_INFO("Not enabling IFF_VNET_HDR; "
+ "TUNGETFEATURES ioctl() reports no IFF_VNET_HDR");
return 0;
}
@@ -443,17 +443,17 @@ brProbeVnetHdr(int tapfd)
* If TUNGETIFF is not implemented then errno == EBADFD.
*/
if (ioctl(tapfd, TUNGETIFF, &dummy) != -1 || errno != EBADFD) {
- VIR_INFO(_("Not enabling IFF_VNET_HDR; "
- "TUNGETIFF ioctl() not implemented"));
+ VIR_INFO("Not enabling IFF_VNET_HDR; "
+ "TUNGETIFF ioctl() not implemented");
return 0;
}
- VIR_INFO(_("Enabling IFF_VNET_HDR"));
+ VIR_INFO("Enabling IFF_VNET_HDR");
return 1;
# else
(void) tapfd;
- VIR_INFO(_("Not enabling IFF_VNET_HDR; disabled at build time"));
+ VIR_INFO("Not enabling IFF_VNET_HDR; disabled at build time");
return 0;
# endif
}
--
1.7.4.4