External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 06:05:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bulk replace 'informations' with 'information'

Browse Source
This commit is contained in:
Daniel P. Berrange 2006-07-19 22:24:37 +00:00
parent 16e2cc5174
commit 53161d7cb2
9 changed files with 46 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Wed Jul 19 17:26:48 EDT 2006 Daniel Berrange <berrange@redhat.com>
* src/*.c: Bulk replace 'informations' with 'information' to
correct English spelling
Thu Jul 13 23:33:48 CEST 2006 Daniel Veillard <veillard@redhat.com> Thu Jul 13 23:33:48 CEST 2006 Daniel Veillard <veillard@redhat.com>
* src/xml.c: applied patch from Peter Vetere to pass down the * src/xml.c: applied patch from Peter Vetere to pass down the

2
src/libvirt.c
View File

@ -1396,7 +1396,7 @@ virDomainSetMemory(virDomainPtr domain, unsigned long memory)
* @info: pointer to a virDomainInfo structure allocated by the user * @info: pointer to a virDomainInfo structure allocated by the user
* *
* Extract information about a domain. Note that if the connection * 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. * can be extracted.
* *
* Returns 0 in case of success and -1 in case of failure. * Returns 0 in case of success and -1 in case of failure.

4
src/proxy_internal.h
View File

@ -76,8 +76,8 @@ struct _virProxyFullPacket {
union { union {
char str[4080]; /* extra char array */ char str[4080]; /* extra char array */
int arg[1020]; /* extra int array */ int arg[1020]; /* extra int array */
virDomainInfo dinfo; /* domain informations */ virDomainInfo dinfo; /* domain information */
virNodeInfo ninfo; /* node informations */ virNodeInfo ninfo; /* node information */
} extra; } extra;
}; };
typedef struct _virProxyFullPacket virProxyFullPacket; typedef struct _virProxyFullPacket virProxyFullPacket;

6
src/virsh.c
View File

@ -231,7 +231,7 @@ static vshCmdInfo info_help[] = {
{"syntax", "help [<command>]"}, {"syntax", "help [<command>]"},
{"help", "print help"}, {"help", "print help"},
{"desc", "Prints global help or command specific help."}, {"desc", "Prints global help or command specific help."},
{"version", "Prints versionning informations."}, {"version", "Prints version information."},
{NULL, NULL} {NULL, NULL}
}; };
@ -833,7 +833,7 @@ cmdNodeinfo(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED)
static vshCmdInfo info_dumpxml[] = { static vshCmdInfo info_dumpxml[] = {
{"syntax", "dumpxml <name>"}, {"syntax", "dumpxml <name>"},
{"help", "domain information in XML"}, {"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} {NULL, NULL}
}; };
@ -968,7 +968,7 @@ cmdDomuuid(vshControl * ctl, vshCmd * cmd)
static vshCmdInfo info_version[] = { static vshCmdInfo info_version[] = {
{"syntax", "version"}, {"syntax", "version"},
{"help", "show versions"}, {"help", "show versions"},
{"desc", "Display the version informations available"}, {"desc", "Display the version information available"},
{NULL, NULL} {NULL, NULL}
}; };

26
src/virterror.c
View File

@ -456,43 +456,43 @@ __virErrorMsg(virErrorNumber error, const char *info)
errmsg = "unknown OS type %s"; errmsg = "unknown OS type %s";
break; break;
case VIR_ERR_NO_KERNEL: case VIR_ERR_NO_KERNEL:
errmsg = "missing kernel informations"; errmsg = "missing kernel information";
break; break;
case VIR_ERR_NO_ROOT: case VIR_ERR_NO_ROOT:
if (info == NULL) if (info == NULL)
errmsg = "missing root device informations"; errmsg = "missing root device information";
else else
errmsg = "missing root device informations in %s"; errmsg = "missing root device information in %s";
break; break;
case VIR_ERR_NO_SOURCE: case VIR_ERR_NO_SOURCE:
if (info == NULL) if (info == NULL)
errmsg = "missing source informations for device"; errmsg = "missing source information for device";
else else
errmsg = "missing source informations for device %s"; errmsg = "missing source information for device %s";
break; break;
case VIR_ERR_NO_TARGET: case VIR_ERR_NO_TARGET:
if (info == NULL) if (info == NULL)
errmsg = "missing target informations for device"; errmsg = "missing target information for device";
else else
errmsg = "missing target informations for device %s"; errmsg = "missing target information for device %s";
break; break;
case VIR_ERR_NO_NAME: case VIR_ERR_NO_NAME:
if (info == NULL) if (info == NULL)
errmsg = "missing domain name informations"; errmsg = "missing domain name information";
else else
errmsg = "missing domain name informations in %s"; errmsg = "missing domain name information in %s";
break; break;
case VIR_ERR_NO_OS: case VIR_ERR_NO_OS:
if (info == NULL) if (info == NULL)
errmsg = "missing operating system informations"; errmsg = "missing operating system information";
else else
errmsg = "missing operating system informations for %s"; errmsg = "missing operating system information for %s";
break; break;
case VIR_ERR_NO_DEVICE: case VIR_ERR_NO_DEVICE:
if (info == NULL) if (info == NULL)
errmsg = "missing devices informations"; errmsg = "missing devices information";
else else
errmsg = "missing devices informations for %s"; errmsg = "missing devices information for %s";
break; break;
case VIR_ERR_DRIVER_FULL: case VIR_ERR_DRIVER_FULL:
if (info == NULL) if (info == NULL)

10
src/xen_internal.c
View File

@ -582,9 +582,9 @@ xenHypervisorGetMaxMemory(virDomainPtr domain)
* xenHypervisorGetDomInfo: * xenHypervisorGetDomInfo:
* @conn: connection data * @conn: connection data
* @id: the domain ID * @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. * Returns 0 in case of success, -1 in case of error.
*/ */
@ -660,9 +660,9 @@ xenHypervisorGetDomInfo(virConnectPtr conn, int id, virDomainInfoPtr info)
/** /**
* xenHypervisorGetDomainInfo: * xenHypervisorGetDomainInfo:
* @domain: pointer to the domain block * @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. * Returns 0 in case of success, -1 in case of error.
*/ */
@ -794,7 +794,7 @@ xenHypervisorSetMaxMemory(virDomainPtr domain, unsigned long memory)
/** /**
* xenHypervisorCheckID: * xenHypervisorCheckID:
* @domain: pointer to the domain block * @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 * Do an hypervisor call to verify the domain ID is valid
* *

24
src/xend_internal.c
View File

@ -443,7 +443,7 @@ xend_get(virConnectPtr xend, const char *path,
* xend_post: * xend_post:
* @xend: pointer to the Xen Daemon structure * @xend: pointer to the Xen Daemon structure
* @path: the path used for the HTTP request * @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 * @content: the buffer to store the content
* @n_content: the size of the buffer * @n_content: the size of the buffer
* *
@ -1105,20 +1105,20 @@ xenDaemonDomainLookupByName_ids(virConnectPtr xend, const char *domname,
value = sexpr_node(root, "domain/domid"); value = sexpr_node(root, "domain/domid");
if (value == NULL) { if (value == NULL) {
virXendError(xend, VIR_ERR_INTERNAL_ERROR, virXendError(xend, VIR_ERR_INTERNAL_ERROR,
"domain informations incomplete, missing domid"); "domain information incomplete, missing domid");
goto error; goto error;
} }
ret = strtol(value, NULL, 0); ret = strtol(value, NULL, 0);
if ((ret == 0) && (value[0] != '0')) { if ((ret == 0) && (value[0] != '0')) {
virXendError(xend, VIR_ERR_INTERNAL_ERROR, virXendError(xend, VIR_ERR_INTERNAL_ERROR,
"domain informations incorrect domid not numberic"); "domain information incorrect domid not numberic");
ret = -1; ret = -1;
} else if (uuid != NULL) { } else if (uuid != NULL) {
char **ptr = (char **) &uuid; char **ptr = (char **) &uuid;
if (sexpr_uuid(ptr, root, "domain/uuid") == NULL) { if (sexpr_uuid(ptr, root, "domain/uuid") == NULL) {
virXendError(xend, VIR_ERR_INTERNAL_ERROR, 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"); name = sexpr_node(root, "domain/name");
if (name == NULL) { if (name == NULL) {
virXendError(xend, VIR_ERR_INTERNAL_ERROR, virXendError(xend, VIR_ERR_INTERNAL_ERROR,
"domain informations incomplete, missing name"); "domain information incomplete, missing name");
goto error; goto error;
} }
if (domname) if (domname)
@ -1167,7 +1167,7 @@ xenDaemonDomainLookupByID(virConnectPtr xend,
dst_uuid = (char *)&uuid[0]; dst_uuid = (char *)&uuid[0];
if (sexpr_uuid(&dst_uuid, root, "domain/uuid") == NULL) { if (sexpr_uuid(&dst_uuid, root, "domain/uuid") == NULL) {
virXendError(xend, VIR_ERR_INTERNAL_ERROR, virXendError(xend, VIR_ERR_INTERNAL_ERROR,
"domain informations incomplete, missing uuid"); "domain information incomplete, missing uuid");
goto error; 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"); tmp = sexpr_node(node, "domain/image/hvm/kernel");
if (tmp == NULL) { if (tmp == NULL) {
virXendError(NULL, VIR_ERR_INTERNAL_ERROR, virXendError(NULL, VIR_ERR_INTERNAL_ERROR,
"domain informations incomplete, missing kernel"); "domain information incomplete, missing kernel");
return(-1); return(-1);
} }
virBufferVSprintf(buf, " <loader>%s</loader>\n", tmp); virBufferVSprintf(buf, " <loader>%s</loader>\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"); tmp = sexpr_node(node, "domain/image/linux/kernel");
if (tmp == NULL) { if (tmp == NULL) {
virXendError(NULL, VIR_ERR_INTERNAL_ERROR, virXendError(NULL, VIR_ERR_INTERNAL_ERROR,
"domain informations incomplete, missing kernel"); "domain information incomplete, missing kernel");
return(-1); return(-1);
} }
virBufferVSprintf(buf, " <kernel>%s</kernel>\n", tmp); virBufferVSprintf(buf, " <kernel>%s</kernel>\n", tmp);
@ -1461,7 +1461,7 @@ xend_parse_sexp_desc(struct sexpr *root)
tmp = sexpr_node(root, "domain/name"); tmp = sexpr_node(root, "domain/name");
if (tmp == NULL) { if (tmp == NULL) {
virXendError(NULL, VIR_ERR_INTERNAL_ERROR, virXendError(NULL, VIR_ERR_INTERNAL_ERROR,
"domain informations incomplete, missing name"); "domain information incomplete, missing name");
goto error; goto error;
} }
virBufferVSprintf(&buf, " <name>%s</name>\n", tmp); virBufferVSprintf(&buf, " <name>%s</name>\n", tmp);
@ -1524,7 +1524,7 @@ xend_parse_sexp_desc(struct sexpr *root)
tmp = sexpr_node(node, "device/vbd/dev"); tmp = sexpr_node(node, "device/vbd/dev");
if (tmp == NULL) { if (tmp == NULL) {
virXendError(NULL, VIR_ERR_INTERNAL_ERROR, virXendError(NULL, VIR_ERR_INTERNAL_ERROR,
"domain informations incomplete, vbd has no dev"); "domain information incomplete, vbd has no dev");
goto error; goto error;
} }
virBufferVSprintf(&buf, " <target dev='%s'/>\n", tmp); virBufferVSprintf(&buf, " <target dev='%s'/>\n", tmp);
@ -1539,7 +1539,7 @@ xend_parse_sexp_desc(struct sexpr *root)
tmp = sexpr_node(node, "device/vbd/dev"); tmp = sexpr_node(node, "device/vbd/dev");
if (tmp == NULL) { if (tmp == NULL) {
virXendError(NULL, VIR_ERR_INTERNAL_ERROR, virXendError(NULL, VIR_ERR_INTERNAL_ERROR,
"domain informations incomplete, vbd has no dev"); "domain information incomplete, vbd has no dev");
goto error; goto error;
} }
virBufferVSprintf(&buf, " <target dev='%s'/>\n", tmp); virBufferVSprintf(&buf, " <target dev='%s'/>\n", tmp);
@ -1748,7 +1748,7 @@ sexpr_to_domain(virConnectPtr conn, struct sexpr *root)
error: error:
virXendError(conn, VIR_ERR_INTERNAL_ERROR, virXendError(conn, VIR_ERR_INTERNAL_ERROR,
"failed to parse Xend domain informations"); "failed to parse Xend domain information");
if (ret != NULL) if (ret != NULL)
virFreeDomain(conn, ret); virFreeDomain(conn, ret);
return(NULL); return(NULL);

6
src/xml.c
View File

@ -246,7 +246,7 @@ virDomainGetXMLDeviceInfo(virDomainPtr domain, const char *sub,
* @buf: the output buffer object * @buf: the output buffer object
* @dev: the xenstrore internal device number * @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 * 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 * @buf: the output buffer object
* @dev: the xenstrore internal device number * @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 * the domain
* *
* Returns 0 in case of success, -1 in case of failure * Returns 0 in case of success, -1 in case of failure
@ -457,7 +457,7 @@ virDomainGetXMLInterfaces(virDomainPtr domain, virBufferPtr buf)
* @domain: a domain object * @domain: a domain object
* @buf: the output buffer 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 * Returns 0 in case of success, -1 in case of failure
*/ */

4
src/xs_internal.c
View File

@ -327,9 +327,9 @@ xenStoreClose(virConnectPtr conn)
/** /**
* xenStoreGetDomainInfo: * xenStoreGetDomainInfo:
* @domain: pointer to the domain block * @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. * Returns 0 in case of success, -1 in case of error.
*/ */