From 53161d7cb2a92bb6d7f3f7f23702667eb1debb11 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Wed, 19 Jul 2006 22:24:37 +0000 Subject: [PATCH] Bulk replace 'informations' with 'information' --- ChangeLog | 5 +++++ src/libvirt.c | 2 +- src/proxy_internal.h | 4 ++-- src/virsh.c | 6 +++--- src/virterror.c | 26 +++++++++++++------------- src/xen_internal.c | 10 +++++----- src/xend_internal.c | 24 ++++++++++++------------ src/xml.c | 6 +++--- src/xs_internal.c | 4 ++-- 9 files changed, 46 insertions(+), 41 deletions(-) diff --git a/ChangeLog b/ChangeLog index 18b1919a7a..95018e477c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Jul 19 17:26:48 EDT 2006 Daniel Berrange + + * src/*.c: Bulk replace 'informations' with 'information' to + correct English spelling + Thu Jul 13 23:33:48 CEST 2006 Daniel Veillard * src/xml.c: applied patch from Peter Vetere to pass down the diff --git a/src/libvirt.c b/src/libvirt.c index 6cfface03d..f5734d2f78 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -1396,7 +1396,7 @@ virDomainSetMemory(virDomainPtr domain, unsigned long memory) * @info: pointer to a virDomainInfo structure allocated by the user * * Extract information about a domain. Note that if the connection - * used to get the domain is limited only a partial set of the informations + * used to get the domain is limited only a partial set of the information * can be extracted. * * Returns 0 in case of success and -1 in case of failure. diff --git a/src/proxy_internal.h b/src/proxy_internal.h index 705af8645a..bc8e5d8796 100644 --- a/src/proxy_internal.h +++ b/src/proxy_internal.h @@ -76,8 +76,8 @@ struct _virProxyFullPacket { union { char str[4080]; /* extra char array */ int arg[1020]; /* extra int array */ - virDomainInfo dinfo; /* domain informations */ - virNodeInfo ninfo; /* node informations */ + virDomainInfo dinfo; /* domain information */ + virNodeInfo ninfo; /* node information */ } extra; }; typedef struct _virProxyFullPacket virProxyFullPacket; diff --git a/src/virsh.c b/src/virsh.c index 92307da8aa..84a05554e3 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -231,7 +231,7 @@ static vshCmdInfo info_help[] = { {"syntax", "help []"}, {"help", "print help"}, {"desc", "Prints global help or command specific help."}, - {"version", "Prints versionning informations."}, + {"version", "Prints version information."}, {NULL, NULL} }; @@ -833,7 +833,7 @@ cmdNodeinfo(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) static vshCmdInfo info_dumpxml[] = { {"syntax", "dumpxml "}, {"help", "domain information in XML"}, - {"desc", "Ouput the domain informations as an XML dump to stdout"}, + {"desc", "Ouput the domain information as an XML dump to stdout"}, {NULL, NULL} }; @@ -968,7 +968,7 @@ cmdDomuuid(vshControl * ctl, vshCmd * cmd) static vshCmdInfo info_version[] = { {"syntax", "version"}, {"help", "show versions"}, - {"desc", "Display the version informations available"}, + {"desc", "Display the version information available"}, {NULL, NULL} }; diff --git a/src/virterror.c b/src/virterror.c index 3688549ae0..ded2cce979 100644 --- a/src/virterror.c +++ b/src/virterror.c @@ -456,43 +456,43 @@ __virErrorMsg(virErrorNumber error, const char *info) errmsg = "unknown OS type %s"; break; case VIR_ERR_NO_KERNEL: - errmsg = "missing kernel informations"; + errmsg = "missing kernel information"; break; case VIR_ERR_NO_ROOT: if (info == NULL) - errmsg = "missing root device informations"; + errmsg = "missing root device information"; else - errmsg = "missing root device informations in %s"; + errmsg = "missing root device information in %s"; break; case VIR_ERR_NO_SOURCE: if (info == NULL) - errmsg = "missing source informations for device"; + errmsg = "missing source information for device"; else - errmsg = "missing source informations for device %s"; + errmsg = "missing source information for device %s"; break; case VIR_ERR_NO_TARGET: if (info == NULL) - errmsg = "missing target informations for device"; + errmsg = "missing target information for device"; else - errmsg = "missing target informations for device %s"; + errmsg = "missing target information for device %s"; break; case VIR_ERR_NO_NAME: if (info == NULL) - errmsg = "missing domain name informations"; + errmsg = "missing domain name information"; else - errmsg = "missing domain name informations in %s"; + errmsg = "missing domain name information in %s"; break; case VIR_ERR_NO_OS: if (info == NULL) - errmsg = "missing operating system informations"; + errmsg = "missing operating system information"; else - errmsg = "missing operating system informations for %s"; + errmsg = "missing operating system information for %s"; break; case VIR_ERR_NO_DEVICE: if (info == NULL) - errmsg = "missing devices informations"; + errmsg = "missing devices information"; else - errmsg = "missing devices informations for %s"; + errmsg = "missing devices information for %s"; break; case VIR_ERR_DRIVER_FULL: if (info == NULL) diff --git a/src/xen_internal.c b/src/xen_internal.c index 8ec4f1b54d..b4aef0e528 100644 --- a/src/xen_internal.c +++ b/src/xen_internal.c @@ -582,9 +582,9 @@ xenHypervisorGetMaxMemory(virDomainPtr domain) * xenHypervisorGetDomInfo: * @conn: connection data * @id: the domain ID - * @info: the place where informations should be stored + * @info: the place where information should be stored * - * Do an hypervisor call to get the related set of domain informations. + * Do an hypervisor call to get the related set of domain information. * * Returns 0 in case of success, -1 in case of error. */ @@ -660,9 +660,9 @@ xenHypervisorGetDomInfo(virConnectPtr conn, int id, virDomainInfoPtr info) /** * xenHypervisorGetDomainInfo: * @domain: pointer to the domain block - * @info: the place where informations should be stored + * @info: the place where information should be stored * - * Do an hypervisor call to get the related set of domain informations. + * Do an hypervisor call to get the related set of domain information. * * Returns 0 in case of success, -1 in case of error. */ @@ -794,7 +794,7 @@ xenHypervisorSetMaxMemory(virDomainPtr domain, unsigned long memory) /** * xenHypervisorCheckID: * @domain: pointer to the domain block - * @info: the place where informations should be stored + * @info: the place where information should be stored * * Do an hypervisor call to verify the domain ID is valid * diff --git a/src/xend_internal.c b/src/xend_internal.c index 35f4856672..183229e970 100644 --- a/src/xend_internal.c +++ b/src/xend_internal.c @@ -443,7 +443,7 @@ xend_get(virConnectPtr xend, const char *path, * xend_post: * @xend: pointer to the Xen Daemon structure * @path: the path used for the HTTP request - * @ops: the informations sent for the POST + * @ops: the information sent for the POST * @content: the buffer to store the content * @n_content: the size of the buffer * @@ -1105,20 +1105,20 @@ xenDaemonDomainLookupByName_ids(virConnectPtr xend, const char *domname, value = sexpr_node(root, "domain/domid"); if (value == NULL) { virXendError(xend, VIR_ERR_INTERNAL_ERROR, - "domain informations incomplete, missing domid"); + "domain information incomplete, missing domid"); goto error; } ret = strtol(value, NULL, 0); if ((ret == 0) && (value[0] != '0')) { virXendError(xend, VIR_ERR_INTERNAL_ERROR, - "domain informations incorrect domid not numberic"); + "domain information incorrect domid not numberic"); ret = -1; } else if (uuid != NULL) { char **ptr = (char **) &uuid; if (sexpr_uuid(ptr, root, "domain/uuid") == NULL) { virXendError(xend, VIR_ERR_INTERNAL_ERROR, - "domain informations incomplete, missing uuid"); + "domain information incomplete, missing uuid"); } } @@ -1158,7 +1158,7 @@ xenDaemonDomainLookupByID(virConnectPtr xend, name = sexpr_node(root, "domain/name"); if (name == NULL) { virXendError(xend, VIR_ERR_INTERNAL_ERROR, - "domain informations incomplete, missing name"); + "domain information incomplete, missing name"); goto error; } if (domname) @@ -1167,7 +1167,7 @@ xenDaemonDomainLookupByID(virConnectPtr xend, dst_uuid = (char *)&uuid[0]; if (sexpr_uuid(&dst_uuid, root, "domain/uuid") == NULL) { virXendError(xend, VIR_ERR_INTERNAL_ERROR, - "domain informations incomplete, missing uuid"); + "domain information incomplete, missing uuid"); goto error; } @@ -1384,7 +1384,7 @@ xend_parse_sexp_desc_os(struct sexpr *node, virBufferPtr buf, int hvm) tmp = sexpr_node(node, "domain/image/hvm/kernel"); if (tmp == NULL) { virXendError(NULL, VIR_ERR_INTERNAL_ERROR, - "domain informations incomplete, missing kernel"); + "domain information incomplete, missing kernel"); return(-1); } virBufferVSprintf(buf, " %s\n", tmp); @@ -1407,7 +1407,7 @@ xend_parse_sexp_desc_os(struct sexpr *node, virBufferPtr buf, int hvm) tmp = sexpr_node(node, "domain/image/linux/kernel"); if (tmp == NULL) { virXendError(NULL, VIR_ERR_INTERNAL_ERROR, - "domain informations incomplete, missing kernel"); + "domain information incomplete, missing kernel"); return(-1); } virBufferVSprintf(buf, " %s\n", tmp); @@ -1461,7 +1461,7 @@ xend_parse_sexp_desc(struct sexpr *root) tmp = sexpr_node(root, "domain/name"); if (tmp == NULL) { virXendError(NULL, VIR_ERR_INTERNAL_ERROR, - "domain informations incomplete, missing name"); + "domain information incomplete, missing name"); goto error; } virBufferVSprintf(&buf, " %s\n", tmp); @@ -1524,7 +1524,7 @@ xend_parse_sexp_desc(struct sexpr *root) tmp = sexpr_node(node, "device/vbd/dev"); if (tmp == NULL) { virXendError(NULL, VIR_ERR_INTERNAL_ERROR, - "domain informations incomplete, vbd has no dev"); + "domain information incomplete, vbd has no dev"); goto error; } virBufferVSprintf(&buf, " \n", tmp); @@ -1539,7 +1539,7 @@ xend_parse_sexp_desc(struct sexpr *root) tmp = sexpr_node(node, "device/vbd/dev"); if (tmp == NULL) { virXendError(NULL, VIR_ERR_INTERNAL_ERROR, - "domain informations incomplete, vbd has no dev"); + "domain information incomplete, vbd has no dev"); goto error; } virBufferVSprintf(&buf, " \n", tmp); @@ -1748,7 +1748,7 @@ sexpr_to_domain(virConnectPtr conn, struct sexpr *root) error: virXendError(conn, VIR_ERR_INTERNAL_ERROR, - "failed to parse Xend domain informations"); + "failed to parse Xend domain information"); if (ret != NULL) virFreeDomain(conn, ret); return(NULL); diff --git a/src/xml.c b/src/xml.c index 798f53461f..e1b4e8ad40 100644 --- a/src/xml.c +++ b/src/xml.c @@ -246,7 +246,7 @@ virDomainGetXMLDeviceInfo(virDomainPtr domain, const char *sub, * @buf: the output buffer object * @dev: the xenstrore internal device number * - * Extract and dump in the buffer informations on the device used by the domain + * Extract and dump in the buffer information on the device used by the domain * * Returns 0 in case of success, -1 in case of failure */ @@ -357,7 +357,7 @@ virDomainGetXMLDevices(virDomainPtr domain, virBufferPtr buf) * @buf: the output buffer object * @dev: the xenstrore internal device number * - * Extract and dump in the buffer informations on the interface used by + * Extract and dump in the buffer information on the interface used by * the domain * * Returns 0 in case of success, -1 in case of failure @@ -457,7 +457,7 @@ virDomainGetXMLInterfaces(virDomainPtr domain, virBufferPtr buf) * @domain: a domain object * @buf: the output buffer object * - * Extract the boot informations used to start that domain + * Extract the boot information used to start that domain * * Returns 0 in case of success, -1 in case of failure */ diff --git a/src/xs_internal.c b/src/xs_internal.c index e648a19763..1ed72a7a50 100644 --- a/src/xs_internal.c +++ b/src/xs_internal.c @@ -327,9 +327,9 @@ xenStoreClose(virConnectPtr conn) /** * xenStoreGetDomainInfo: * @domain: pointer to the domain block - * @info: the place where informations should be stored + * @info: the place where information should be stored * - * Do an hypervisor call to get the related set of domain informations. + * Do an hypervisor call to get the related set of domain information. * * Returns 0 in case of success, -1 in case of error. */