2:01 a.m.
We prefer c89 style of comments.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
examples/openauth/openauth.c | 2 +-
src/lxc/lxc_controller.c | 2 +-
src/remote/remote_driver.c | 2 +-
src/rpc/virnetservermdns.c | 2 +-
src/security/security_stack.c | 8 ++++----
src/uml/uml_conf.c | 2 +-
src/util/virhostcpu.c | 4 ++--
src/util/virhostmem.c | 4 ++--
src/vbox/vbox_snapshot_conf.c | 2 +-
tests/eventtest.c | 2 +-
tests/virhostcpumock.c | 2 +-
11 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/examples/openauth/openauth.c b/examples/openauth/openauth.c
index 7a8254b..eef46d5 100644
--- a/examples/openauth/openauth.c
+++ b/examples/openauth/openauth.c
@@ -216,7 +216,7 @@ static virConnectAuth auth = {
credTypes,
sizeof(credTypes) / sizeof(int),
authCallback,
- NULL, // cbdata will be initialized in main
+ NULL, /* cbdata will be initialized in main */
};
diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
index 88ba8aa..1b9d215 100644
--- a/src/lxc/lxc_controller.c
+++ b/src/lxc/lxc_controller.c
@@ -1800,7 +1800,7 @@ virLXCControllerSetupHostdevCaps(virDomainDefPtr vmDef,
securityDriver);
case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_NET:
- return 0; // case is handled in virLXCControllerMoveInterfaces
+ return 0; /* case is handled in virLXCControllerMoveInterfaces */
default:
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 1242bd6..77250ea 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -1145,7 +1145,7 @@ doRemoteOpen(virConnectPtr conn,
if (!(priv->closeCallback = virNewConnectCloseCallbackData()))
goto failed;
- // ref on behalf of netclient
+ /* ref on behalf of netclient */
virObjectRef(priv->closeCallback);
virNetClientSetCloseCallback(priv->client,
remoteClientCloseFunc,
diff --git a/src/rpc/virnetservermdns.c b/src/rpc/virnetservermdns.c
index 7f12a29..8d7df24 100644
--- a/src/rpc/virnetservermdns.c
+++ b/src/rpc/virnetservermdns.c
@@ -128,7 +128,7 @@ static void virNetServerMDNSGroupCallback(AvahiEntryGroup *g
ATTRIBUTE_UNUSED,
avahi_strerror(avahi_client_errno(group->mdns->client)));
/* Some kind of failure happened while we were registering our services */
- //avahi_simple_poll_quit(simple_poll);
+ /* avahi_simple_poll_quit(simple_poll); */
break;
case AVAHI_ENTRY_GROUP_UNCOMMITED:
diff --git a/src/security/security_stack.c b/src/security/security_stack.c
index b02ee18..9a1a7b3 100644
--- a/src/security/security_stack.c
+++ b/src/security/security_stack.c
@@ -210,7 +210,7 @@ virSecurityStackGenLabel(virSecurityManagerPtr mgr,
if (virSecurityManagerGenLabel(virSecurityStackGetPrimary(mgr), vm) < 0)
rc = -1;
-// TODO
+/* TODO */
#if 0
/* We don't allow secondary drivers to generate labels.
* This may have to change in the future, but requires
@@ -235,7 +235,7 @@ virSecurityStackReleaseLabel(virSecurityManagerPtr mgr,
if (virSecurityManagerReleaseLabel(virSecurityStackGetPrimary(mgr), vm) < 0)
rc = -1;
-// TODO
+/* TODO */
#if 0
/* XXX See note in GenLabel */
if (virSecurityManagerReleaseLabel(priv->secondary, vm) < 0)
@@ -255,7 +255,7 @@ virSecurityStackReserveLabel(virSecurityManagerPtr mgr,
if (virSecurityManagerReserveLabel(virSecurityStackGetPrimary(mgr), vm, pid) < 0)
rc = -1;
-// TODO
+/* TODO */
#if 0
/* XXX See note in GenLabel */
if (virSecurityManagerReserveLabel(priv->secondary, vm, pid) < 0)
@@ -460,7 +460,7 @@ virSecurityStackGetProcessLabel(virSecurityManagerPtr mgr,
{
int rc = 0;
-// TODO
+/* TODO */
#if 0
if (virSecurityManagerGetProcessLabel(priv->secondary, vm, pid, seclabel) < 0)
rc = -1;
diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c
index bdef783..d223af0 100644
--- a/src/uml/uml_conf.c
+++ b/src/uml/uml_conf.c
@@ -399,7 +399,7 @@ virCommandPtr umlBuildCommandLine(virConnectPtr conn,
virCommandAddEnvPassCommon(cmd);
- //virCommandAddArgPair(cmd, "con0", "fd:0,fd:1");
+ /* virCommandAddArgPair(cmd, "con0", "fd:0,fd:1"); */
virCommandAddArgFormat(cmd, "mem=%lluK", vm->def->mem.cur_balloon);
virCommandAddArgPair(cmd, "umid", vm->def->name);
virCommandAddArgPair(cmd, "uml_dir", driver->monitorDir);
diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c
index a660e3f..8397307 100644
--- a/src/util/virhostcpu.c
+++ b/src/util/virhostcpu.c
@@ -795,8 +795,8 @@ virHostCPUGetStatsLinux(FILE *procstat,
if (STRPREFIX(buf, cpu_header)) { /* aka logical CPU time */
if (sscanf(buf,
- "%*s %llu %llu %llu %llu %llu" // user ~ iowait
- "%llu %llu %llu %llu %llu", // irq ~ guest_nice
+ "%*s %llu %llu %llu %llu %llu" /* user ~ iowait */
+ "%llu %llu %llu %llu %llu", /* irq ~ guest_nice */
&usr, &ni, &sys, &idle, &iowait,
&irq, &softirq, &steal, &guest, &guest_nice)
< 4) {
continue;
diff --git a/src/util/virhostmem.c b/src/util/virhostmem.c
index 2ac90a0..a9ba278 100644
--- a/src/util/virhostmem.c
+++ b/src/util/virhostmem.c
@@ -158,8 +158,8 @@ virHostMemGetStatsLinux(FILE *meminfo,
char meminfo_hdr[VIR_NODE_MEMORY_STATS_FIELD_LENGTH];
unsigned long val;
struct field_conv {
- const char *meminfo_hdr; // meminfo header
- const char *field; // MemoryStats field name
+ const char *meminfo_hdr; /* meminfo header */
+ const char *field; /* MemoryStats field name */
} field_conv[] = {
{"MemTotal:", VIR_NODE_MEMORY_STATS_TOTAL},
{"MemFree:", VIR_NODE_MEMORY_STATS_FREE},
diff --git a/src/vbox/vbox_snapshot_conf.c b/src/vbox/vbox_snapshot_conf.c
index 8bf7ef3..c3b2855 100644
--- a/src/vbox/vbox_snapshot_conf.c
+++ b/src/vbox/vbox_snapshot_conf.c
@@ -958,7 +958,7 @@ virVBoxSnapshotConfRemoveHardDisk(virVBoxSnapshotConfMediaRegistryPtr
mediaRegis
goto cleanup;
}
if (hardDisk->parent == NULL) {
- //it means that the hard disk is in 'root'
+ /* it means that the hard disk is in 'root' */
for (i = 0; i < mediaRegistry->ndisks; i++) {
if (hardDisk == mediaRegistry->disks[i])
break;
diff --git a/tests/eventtest.c b/tests/eventtest.c
index ea47fb0..0c1ec71 100644
--- a/tests/eventtest.c
+++ b/tests/eventtest.c
@@ -523,7 +523,7 @@ mymain(void)
if (finishJob("Write duplicate", 1, -1) != EXIT_SUCCESS)
return EXIT_FAILURE;
- //pthread_kill(eventThread, SIGTERM);
+ /* pthread_kill(eventThread, SIGTERM); */
return EXIT_SUCCESS;
}
diff --git a/tests/virhostcpumock.c b/tests/virhostcpumock.c
index 00d10f1..48147b2 100644
--- a/tests/virhostcpumock.c
+++ b/tests/virhostcpumock.c
@@ -26,7 +26,7 @@ virHostCPUGetThreadsPerSubcore(virArch arch)
{
int threads_per_subcore = 0;
- // Emulate SMT=8 on POWER hardware
+ /* Emulate SMT=8 on POWER hardware */
if (ARCH_IS_PPC64(arch))
threads_per_subcore = 8;
--
2.10.2