提交 dbbe16c2 编写于 作者: E Eric Blake

maint: typo fixes

I noticed a couple typos in recent commits, and fixed the remaining
instances of them.

* docs/internals/command.html.in: Fix spelling errors.
* include/libvirt/libvirt.h.in (virConnectDomainEventCallback):
Likewise.
* python/libvirt-override.py (virEventAddHandle): Likewise.
* src/lxc/lxc_container.c (lxcContainerChild): Likewise.
* src/util/hash.c (virHashCreateFull): Likewise.
* src/storage/storage_backend_logical.c
(virStorageBackendLogicalMakeVol): Likewise.
* src/esx/esx_driver.c (esxFormatVMXFileName): Likewise.
* src/vbox/vbox_tmpl.c (vboxIIDIsEqual_v3_x): Likewise.
上级 bab4f31c
...@@ -445,7 +445,7 @@ ...@@ -445,7 +445,7 @@
<strong>Note:</strong> if the command has been daemonized <strong>Note:</strong> if the command has been daemonized
this will only block &amp; wait for the intermediate process, this will only block &amp; wait for the intermediate process,
not the real command. <code>virCommandRun</code> will not the real command. <code>virCommandRun</code> will
report on any errors that have occured upon this point report on any errors that have occurred upon this point
with all previous API calls. If the command fails to with all previous API calls. If the command fails to
run, or exits with non-zero status an error will be run, or exits with non-zero status an error will be
reported via normal libvirt error infrastructure. If a reported via normal libvirt error infrastructure. If a
......
...@@ -2173,8 +2173,8 @@ typedef enum { ...@@ -2173,8 +2173,8 @@ typedef enum {
/** /**
* virConnectDomainEventCallback: * virConnectDomainEventCallback:
* @conn: virConnect connection * @conn: virConnect connection
* @dom: The domain on which the event occured * @dom: The domain on which the event occurred
* @event: The specfic virDomainEventType which occured * @event: The specfic virDomainEventType which occurred
* @detail: event specific detail information * @detail: event specific detail information
* @opaque: opaque user data * @opaque: opaque user data
* *
......
...@@ -179,8 +179,8 @@ def virEventAddHandle(fd, events, cb, opaque): ...@@ -179,8 +179,8 @@ def virEventAddHandle(fd, events, cb, opaque):
Example callback prototype is: Example callback prototype is:
def cb(watch, # int id of the handle def cb(watch, # int id of the handle
fd, # int file descriptor the event occured on fd, # int file descriptor the event occurred on
events, # int bitmap of events that have occured events, # int bitmap of events that have occurred
opaque): # opaque data passed to eventAddHandle opaque): # opaque data passed to eventAddHandle
""" """
cbData = {"cb" : cb, "opaque" : opaque} cbData = {"cb" : cb, "opaque" : opaque}
......
...@@ -276,7 +276,7 @@ esxParseVMXFileName(const char *fileName, void *opaque) ...@@ -276,7 +276,7 @@ esxParseVMXFileName(const char *fileName, void *opaque)
* *
* Firstly parse the datastore path. Then use the datastore name to lookup the * Firstly parse the datastore path. Then use the datastore name to lookup the
* datastore and it's mount path. Finally concatenate the mount path, directory * datastore and it's mount path. Finally concatenate the mount path, directory
* and file name to an absolute path and return it. Detect the seperator type * and file name to an absolute path and return it. Detect the separator type
* based on the mount path. * based on the mount path.
*/ */
static char * static char *
......
...@@ -1117,7 +1117,7 @@ cleanup: ...@@ -1117,7 +1117,7 @@ cleanup:
VIR_FORCE_CLOSE(argv->handshakefd); VIR_FORCE_CLOSE(argv->handshakefd);
if (ret == 0) { if (ret == 0) {
/* this function will only return if an error occured */ /* this function will only return if an error occurred */
ret = virCommandExec(cmd); ret = virCommandExec(cmd);
} }
......
...@@ -167,7 +167,7 @@ virStorageBackendLogicalMakeVol(virStoragePoolObjPtr pool, ...@@ -167,7 +167,7 @@ virStorageBackendLogicalMakeVol(virStoragePoolObjPtr pool,
goto cleanup; goto cleanup;
} }
/* Now parse the "devices" feild seperately */ /* Now parse the "devices" field separately */
regex = strdup(regex_unit); regex = strdup(regex_unit);
for (i = 1; i < nextents; i++) { for (i = 1; i < nextents; i++) {
...@@ -175,7 +175,7 @@ virStorageBackendLogicalMakeVol(virStoragePoolObjPtr pool, ...@@ -175,7 +175,7 @@ virStorageBackendLogicalMakeVol(virStoragePoolObjPtr pool,
virReportOOMError(); virReportOOMError();
goto cleanup; goto cleanup;
} }
/* "," is the seperator of "devices" field */ /* "," is the separator of "devices" field */
strcat(regex, ","); strcat(regex, ",");
strncat(regex, regex_unit, strlen(regex_unit)); strncat(regex, regex_unit, strlen(regex_unit));
} }
......
...@@ -120,7 +120,7 @@ virHashComputeKey(virHashTablePtr table, const void *name) ...@@ -120,7 +120,7 @@ virHashComputeKey(virHashTablePtr table, const void *name)
* *
* Create a new virHashTablePtr. * Create a new virHashTablePtr.
* *
* Returns the newly created object, or NULL if an error occured. * Returns the newly created object, or NULL if an error occurred.
*/ */
virHashTablePtr virHashCreateFull(int size, virHashTablePtr virHashCreateFull(int size,
virHashDataFree dataFree, virHashDataFree dataFree,
......
...@@ -537,7 +537,7 @@ vboxIIDIsEqual_v3_x(vboxGlobalData *data, vboxIID_v3_x *iid1, ...@@ -537,7 +537,7 @@ vboxIIDIsEqual_v3_x(vboxGlobalData *data, vboxIID_v3_x *iid1,
unsigned char uuid2[VIR_UUID_BUFLEN]; unsigned char uuid2[VIR_UUID_BUFLEN];
/* Note: we can't directly compare the utf8 strings here /* Note: we can't directly compare the utf8 strings here
* cause the two UUID's may have seperators as space or '-' * cause the two UUID's may have separators as space or '-'
* or mixture of both and we don't want to fail here by * or mixture of both and we don't want to fail here by
* using direct string comparison. Here virUUIDParse() takes * using direct string comparison. Here virUUIDParse() takes
* care of these cases. */ * care of these cases. */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册