+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>
* src/xml.c: applied patch from Peter Vetere to pass down the
* @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.
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;
{"syntax", "help [<command>]"},
{"help", "print help"},
{"desc", "Prints global help or command specific help."},
- {"version", "Prints versionning informations."},
+ {"version", "Prints version information."},
{NULL, NULL}
};
static vshCmdInfo info_dumpxml[] = {
{"syntax", "dumpxml <name>"},
{"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}
};
static vshCmdInfo info_version[] = {
{"syntax", "version"},
{"help", "show versions"},
- {"desc", "Display the version informations available"},
+ {"desc", "Display the version information available"},
{NULL, NULL}
};
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)
* 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.
*/
/**
* 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.
*/
/**
* 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
*
* 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
*
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");
}
}
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)
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;
}
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, " <loader>%s</loader>\n", tmp);
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, " <kernel>%s</kernel>\n", tmp);
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, " <name>%s</name>\n", tmp);
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, " <target dev='%s'/>\n", tmp);
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, " <target dev='%s'/>\n", tmp);
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);
* @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
*/
* @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
* @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
*/
/**
* 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.
*/