6:09 p.m.
https://bugzilla.redhat.com/show_bug.cgi?id=648855 mentioned a
misuse of 'an' where 'a' is proper; that has since been fixed,
but a search found other problems (some were a spelling error for
'and', while most were fixed by 'a').
* daemon/stream.c: Fix grammar.
* src/conf/domain_conf.c: Likewise.
* src/conf/domain_event.c: Likewise.
* src/esx/esx_driver.c: Likewise.
* src/esx/esx_vi.c: Likewise.
* src/rpc/virnetclient.c: Likewise.
* src/rpc/virnetserverprogram.c: Likewise.
* src/storage/storage_backend_fs.c: Likewise.
* src/util/conf.c: Likewise.
* src/util/dnsmasq.c: Likewise.
* src/util/iptables.c: Likewise.
* src/xen/xen_hypervisor.c: Likewise.
* src/xen/xend_internal.c: Likewise.
* src/xen/xs_internal.c: Likewise.
* tools/virsh.c: Likewise.
---
Pushing under the trivial rule.
daemon/stream.c | 4 ++--
src/conf/domain_conf.c | 2 +-
src/conf/domain_event.c | 2 +-
src/esx/esx_driver.c | 2 +-
src/esx/esx_vi.c | 2 +-
src/rpc/virnetclient.c | 2 +-
src/rpc/virnetserverprogram.c | 2 +-
src/storage/storage_backend_fs.c | 2 +-
src/util/conf.c | 6 +++---
src/util/dnsmasq.c | 4 ++--
src/util/iptables.c | 4 ++--
src/xen/xen_hypervisor.c | 32 ++++++++++++++++----------------
src/xen/xend_internal.c | 2 +-
src/xen/xs_internal.c | 2 +-
tools/virsh.c | 2 +-
15 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/daemon/stream.c b/daemon/stream.c
index 50f8fd4..bb66f75 100644
--- a/daemon/stream.c
+++ b/daemon/stream.c
@@ -1,7 +1,7 @@
/*
* stream.c: APIs for managing client streams
*
- * Copyright (C) 2009 Red Hat, Inc.
+ * Copyright (C) 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
@@ -556,7 +556,7 @@ daemonStreamHandleWriteData(virNetServerClientPtr client,
/*
- * Process an finish handshake from the client.
+ * Process a finish handshake from the client.
*
* Returns a VIR_NET_OK confirmation if successful, or a VIR_NET_ERROR
* if there was a stream error
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 75f21dc..75e51a0 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -4555,7 +4555,7 @@ error:
}
-/* Parse the XML definition for an hub device */
+/* Parse the XML definition for a hub device */
static virDomainHubDefPtr
virDomainHubDefParseXML(xmlNodePtr node, unsigned int flags)
{
diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c
index a04b9d0..614ab97 100644
--- a/src/conf/domain_event.c
+++ b/src/conf/domain_event.c
@@ -1070,7 +1070,7 @@ virDomainEventQueuePop(virDomainEventQueuePtr evtQueue)
* @evtQueue: the dom event queue
* @event: the event to add
*
- * Internal function to push onto the back of an virDomainEventQueue
+ * Internal function to push onto the back of a virDomainEventQueue
*
* Returns: 0 on success, -1 on failure
*/
diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
index f8b3c7a..1e424eb 100644
--- a/src/esx/esx_driver.c
+++ b/src/esx/esx_driver.c
@@ -267,7 +267,7 @@ esxParseVMXFileName(const char *fileName, void *opaque)
/*
- * This function does the inverse of esxParseVMXFileName. It takes an file name
+ * This function does the inverse of esxParseVMXFileName. It takes a file name
* in datastore path format or in absolute format and converts it to a file
* name that can be used in a .vmx file.
*
diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c
index 80f337b..99f25f8 100644
--- a/src/esx/esx_vi.c
+++ b/src/esx/esx_vi.c
@@ -1800,7 +1800,7 @@ esxVI_EnsureSession(esxVI_Context *ctx)
if (ctx->hasSessionIsActive) {
/*
* Use SessionIsActive to check if there is an active session for this
- * connection an re-login in there isn't.
+ * connection and re-login in there isn't.
*/
if (esxVI_SessionIsActive(ctx, ctx->session->key,
ctx->session->userName, &active) < 0) {
diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
index ec06f45..7f9a332 100644
--- a/src/rpc/virnetclient.c
+++ b/src/rpc/virnetclient.c
@@ -1701,7 +1701,7 @@ static int virNetClientSendInternal(virNetClientPtr client,
if (expectReply && nonBlock) {
virNetError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("Attempt to send an non-blocking message with a synchronous
reply"));
+ _("Attempt to send a non-blocking message with a synchronous
reply"));
return -1;
}
diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c
index bbd2d65..d2ede6b 100644
--- a/src/rpc/virnetserverprogram.c
+++ b/src/rpc/virnetserverprogram.c
@@ -340,7 +340,7 @@ cleanup:
* @client: the unlocked client object
* @msg: the complete incoming method call, with header already decoded
*
- * This method is used to dispatch an message representing an
+ * This method is used to dispatch a message representing an
* incoming method call from a client. It decodes the payload
* to obtain method call arguments, invokves the method and
* then sends a reply packet with the return values
diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
index b5acd20..d8dc29c 100644
--- a/src/storage/storage_backend_fs.c
+++ b/src/storage/storage_backend_fs.c
@@ -880,7 +880,7 @@ virStorageBackendFileSystemRefresh(virConnectPtr conn
ATTRIBUTE_UNUSED,
VIR_STORAGE_VOL_OPEN_DEFAULT) < 0) {
/* The backing file is currently unavailable, the capacity,
* allocation, owner, group and mode are unknown. Just log the
- * error an continue.
+ * error and continue.
* Unfortunately virStorageBackendProbeTarget() might already
* have logged a similar message for the same problem, but only
* if AUTO format detection was used. */
diff --git a/src/util/conf.c b/src/util/conf.c
index c8dcc7f..502dafb 100644
--- a/src/util/conf.c
+++ b/src/util/conf.c
@@ -698,7 +698,7 @@ virConfParseStatement(virConfParserCtxtPtr ctxt)
* Parse the subset of the Python language needed to handle simple
* Xen configuration files.
*
- * Returns an handle to lookup settings or NULL if it failed to
+ * Returns a handle to lookup settings or NULL if it failed to
* read or parse the file, use virConfFree() to free the data.
*/
static virConfPtr
@@ -745,7 +745,7 @@ error:
*
* Reads a configuration file.
*
- * Returns an handle to lookup settings or NULL if it failed to
+ * Returns a handle to lookup settings or NULL if it failed to
* read or parse the file, use virConfFree() to free the data.
*/
virConfPtr
@@ -780,7 +780,7 @@ virConfReadFile(const char *filename, unsigned int flags)
* Reads a configuration file loaded in memory. The string can be
* zero terminated in which case @len can be 0
*
- * Returns an handle to lookup settings or NULL if it failed to
+ * Returns a handle to lookup settings or NULL if it failed to
* parse the content, use virConfFree() to free the data.
*/
virConfPtr
diff --git a/src/util/dnsmasq.c b/src/util/dnsmasq.c
index b5f90a6..dcb7195 100644
--- a/src/util/dnsmasq.c
+++ b/src/util/dnsmasq.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007-2010 Red Hat, Inc.
+ * Copyright (C) 2007-2011 Red Hat, Inc.
* Copyright (C) 2010 Satoru SATOH <satoru.satoh(a)gmail.com>
*
* This library is free software; you can redistribute it and/or
@@ -461,7 +461,7 @@ dnsmasqContextNew(const char *network_name,
* dnsmasqContextFree:
* @ctx: pointer to the dnsmasq context
*
- * Free the resources associated with an dnsmasq context
+ * Free the resources associated with a dnsmasq context
*/
void
dnsmasqContextFree(dnsmasqContext *ctx)
diff --git a/src/util/iptables.c b/src/util/iptables.c
index 452d717..3023900 100644
--- a/src/util/iptables.c
+++ b/src/util/iptables.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007-2010 Red Hat, Inc.
+ * Copyright (C) 2007-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
@@ -891,7 +891,7 @@ iptablesOutputFixUdpChecksum(iptablesContext *ctx,
* @iface: the interface name
* @port: the UDP port to match
*
- * Add an rule to the mangle table's POSTROUTING chain that fixes up the
+ * Add a rule to the mangle table's POSTROUTING chain that fixes up the
* checksum of packets with the given destination @port.
* the given @iface interface for TCP packets.
*
diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
index 6c71b65..941686f 100644
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
@@ -556,7 +556,7 @@ typedef struct xen_v0_domainop xen_v0_domainop;
#define XEN_V2_OP_UNPAUSEDOMAIN 4
/*
- * The information for an setmaxmem system hypercall
+ * The information for a setmaxmem system hypercall
*/
#define XEN_V0_OP_SETMAXMEM 28
#define XEN_V1_OP_SETMAXMEM 28
@@ -580,7 +580,7 @@ struct xen_v2d5_setmaxmem {
typedef struct xen_v2d5_setmaxmem xen_v2d5_setmaxmem;
/*
- * The information for an setmaxvcpu system hypercall
+ * The information for a setmaxvcpu system hypercall
*/
#define XEN_V0_OP_SETMAXVCPU 41
#define XEN_V1_OP_SETMAXVCPU 41
@@ -599,7 +599,7 @@ struct xen_v2_setmaxvcpu {
typedef struct xen_v2_setmaxvcpu xen_v2_setmaxvcpu;
/*
- * The information for an setvcpumap system hypercall
+ * The information for a setvcpumap system hypercall
* Note that between 1 and 2 the limitation to 64 physical CPU was lifted
* hence the difference in structures
*/
@@ -647,7 +647,7 @@ struct xen_v2d5_setvcpumap {
typedef struct xen_v2d5_setvcpumap xen_v2d5_setvcpumap;
/*
- * The information for an vcpuinfo system hypercall
+ * The information for a vcpuinfo system hypercall
*/
#define XEN_V0_OP_GETVCPUINFO 43
#define XEN_V1_OP_GETVCPUINFO 43
@@ -866,8 +866,8 @@ virXenErrorFunc(virErrorNumber error, const char *func, const char
*info,
* @handle: the handle to the Xen hypervisor
* @op: pointer to the hypervisor operation structure
*
- * Do an hypervisor operation though the old interface,
- * this leads to an hypervisor call through ioctl.
+ * Do a hypervisor operation though the old interface,
+ * this leads to a hypervisor call through ioctl.
*
* Returns 0 in case of success and -1 in case of error.
*/
@@ -908,7 +908,7 @@ xenHypervisorDoV0Op(int handle, xen_op_v0 * op)
* @handle: the handle to the Xen hypervisor
* @op: pointer to the hypervisor operation structure
*
- * Do an hypervisor v1 operation, this leads to an hypervisor call through
+ * Do a hypervisor v1 operation, this leads to a hypervisor call through
* ioctl.
*
* Returns 0 in case of success and -1 in case of error.
@@ -951,7 +951,7 @@ xenHypervisorDoV1Op(int handle, xen_op_v1* op)
* @handle: the handle to the Xen hypervisor
* @op: pointer to the hypervisor operation structure
*
- * Do an hypervisor v2 system operation, this leads to an hypervisor
+ * Do a hypervisor v2 system operation, this leads to a hypervisor
* call through ioctl.
*
* Returns 0 in case of success and -1 in case of error.
@@ -994,7 +994,7 @@ xenHypervisorDoV2Sys(int handle, xen_op_v2_sys* op)
* @handle: the handle to the Xen hypervisor
* @op: pointer to the hypervisor domain operation structure
*
- * Do an hypervisor v2 domain operation, this leads to an hypervisor
+ * Do a hypervisor v2 domain operation, this leads to a hypervisor
* call through ioctl.
*
* Returns 0 in case of success and -1 in case of error.
@@ -3155,7 +3155,7 @@ xenHypervisorGetMaxMemory(virDomainPtr domain)
* @id: the domain ID
* @info: the place where information should be stored
*
- * Do an hypervisor call to get the related set of domain information.
+ * Do a hypervisor call to get the related set of domain information.
*
* Returns 0 in case of success, -1 in case of error.
*/
@@ -3238,7 +3238,7 @@ xenHypervisorGetDomInfo(virConnectPtr conn, int id, virDomainInfoPtr
info)
* @domain: pointer to the domain block
* @info: the place where information should be stored
*
- * Do an hypervisor call to get the related set of domain information.
+ * Do a hypervisor call to get the related set of domain information.
*
* Returns 0 in case of success, -1 in case of error.
*/
@@ -3382,7 +3382,7 @@ xenHypervisorNodeGetCellsFreeMemory(virConnectPtr conn, unsigned
long long *free
* xenHypervisorPauseDomain:
* @domain: pointer to the domain block
*
- * Do an hypervisor call to pause the given domain
+ * Do a hypervisor call to pause the given domain
*
* Returns 0 in case of success, -1 in case of error.
*/
@@ -3409,7 +3409,7 @@ xenHypervisorPauseDomain(virDomainPtr domain)
* xenHypervisorResumeDomain:
* @domain: pointer to the domain block
*
- * Do an hypervisor call to resume the given domain
+ * Do a hypervisor call to resume the given domain
*
* Returns 0 in case of success, -1 in case of error.
*/
@@ -3437,7 +3437,7 @@ xenHypervisorResumeDomain(virDomainPtr domain)
* @domain: pointer to the domain block
* @flags: an OR'ed set of virDomainDestroyFlagsValues
*
- * Do an hypervisor call to destroy the given domain
+ * Do a hypervisor call to destroy the given domain
*
* Calling this function with no @flags set (equal to zero)
* is equivalent to calling xenHypervisorDestroyDomain.
@@ -3471,7 +3471,7 @@ xenHypervisorDestroyDomainFlags(virDomainPtr domain,
* @domain: pointer to the domain block
* @memory: the max memory size in kilobytes.
*
- * Do an hypervisor call to change the maximum amount of memory used
+ * Do a hypervisor call to change the maximum amount of memory used
*
* Returns 0 in case of success, -1 in case of error.
*/
@@ -3563,7 +3563,7 @@ xenHypervisorPinVcpu(virDomainPtr domain, unsigned int vcpu,
* @domain: pointer to domain object, or NULL for Domain0
* @info: pointer to an array of virVcpuInfo structures (OUT)
* @maxinfo: number of structures in info array
- * @cpumaps: pointer to an bit map of real CPUs for all vcpus of this domain (in 8-bit
bytes) (OUT)
+ * @cpumaps: pointer to a bit map of real CPUs for all vcpus of this domain (in 8-bit
bytes) (OUT)
* If cpumaps is NULL, then no cpumap information is returned by the API.
* It's assumed there is <maxinfo> cpumap in cpumaps array.
* The memory allocated to cpumaps must be (maxinfo * maplen) bytes
diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
index 16165fe..0c0b6cb 100644
--- a/src/xen/xend_internal.c
+++ b/src/xen/xend_internal.c
@@ -2369,7 +2369,7 @@ xenDaemonDomainGetVcpusFlags(virDomainPtr domain, unsigned int
flags)
* @domain: pointer to domain object, or NULL for Domain0
* @info: pointer to an array of virVcpuInfo structures (OUT)
* @maxinfo: number of structures in info array
- * @cpumaps: pointer to an bit map of real CPUs for all vcpus of this domain (in 8-bit
bytes) (OUT)
+ * @cpumaps: pointer to a bit map of real CPUs for all vcpus of this domain (in 8-bit
bytes) (OUT)
* If cpumaps is NULL, then no cpumap information is returned by the API.
* It's assumed there is <maxinfo> cpumap in cpumaps array.
* The memory allocated to cpumaps must be (maxinfo * maplen) bytes
diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c
index 21018fd..a28e6cc 100644
--- a/src/xen/xs_internal.c
+++ b/src/xen/xs_internal.c
@@ -355,7 +355,7 @@ xenStoreClose(virConnectPtr conn)
* @domain: pointer to the domain block
* @info: the place where information should be stored
*
- * Do an hypervisor call to get the related set of domain information.
+ * Do a hypervisor call to get the related set of domain information.
*
* Returns 0 in case of success, -1 in case of error.
*/
diff --git a/tools/virsh.c b/tools/virsh.c
index be4df58..d02be5c 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -13233,7 +13233,7 @@ cmdCPUBaseline(vshControl *ctl, const vshCmd *cmd)
if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0)
return false;
- /* add an separate container around the xml */
+ /* add a separate container around the xml */
virBufferStrcat(&buf, "<container>", buffer,
"</container>", NULL);
if (virBufferError(&buf))
goto no_memory;
--
1.7.7.3