[libvirt] [PATCH] 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. --- Pushing under the trivial rule. docs/internals/command.html.in | 2 +- include/libvirt/libvirt.h.in | 4 ++-- python/libvirt-override.py | 4 ++-- src/esx/esx_driver.c | 2 +- src/lxc/lxc_container.c | 2 +- src/storage/storage_backend_logical.c | 4 ++-- src/util/hash.c | 2 +- src/vbox/vbox_tmpl.c | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/internals/command.html.in b/docs/internals/command.html.in index 8a194ec..7dcf462 100644 --- a/docs/internals/command.html.in +++ b/docs/internals/command.html.in @@ -445,7 +445,7 @@ <strong>Note:</strong> if the command has been daemonized this will only block &amp; wait for the intermediate process, 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 run, or exits with non-zero status an error will be reported via normal libvirt error infrastructure. If a diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 07617be..1e4b2a2 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -2173,8 +2173,8 @@ typedef enum { /** * virConnectDomainEventCallback: * @conn: virConnect connection - * @dom: The domain on which the event occured - * @event: The specfic virDomainEventType which occured + * @dom: The domain on which the event occurred + * @event: The specfic virDomainEventType which occurred * @detail: event specific detail information * @opaque: opaque user data * diff --git a/python/libvirt-override.py b/python/libvirt-override.py index 98241d6..387fddf 100644 --- a/python/libvirt-override.py +++ b/python/libvirt-override.py @@ -179,8 +179,8 @@ def virEventAddHandle(fd, events, cb, opaque): Example callback prototype is: def cb(watch, # int id of the handle - fd, # int file descriptor the event occured on - events, # int bitmap of events that have occured + fd, # int file descriptor the event occurred on + events, # int bitmap of events that have occurred opaque): # opaque data passed to eventAddHandle """ cbData = {"cb" : cb, "opaque" : opaque} diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 3f26557..af30c1b 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -276,7 +276,7 @@ esxParseVMXFileName(const char *fileName, void *opaque) * * 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 - * 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. */ static char * diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 69cea8e..e9891f7 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1117,7 +1117,7 @@ cleanup: VIR_FORCE_CLOSE(argv->handshakefd); if (ret == 0) { - /* this function will only return if an error occured */ + /* this function will only return if an error occurred */ ret = virCommandExec(cmd); } diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index 6137278..51624a7 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -167,7 +167,7 @@ virStorageBackendLogicalMakeVol(virStoragePoolObjPtr pool, goto cleanup; } - /* Now parse the "devices" feild seperately */ + /* Now parse the "devices" field separately */ regex = strdup(regex_unit); for (i = 1; i < nextents; i++) { @@ -175,7 +175,7 @@ virStorageBackendLogicalMakeVol(virStoragePoolObjPtr pool, virReportOOMError(); goto cleanup; } - /* "," is the seperator of "devices" field */ + /* "," is the separator of "devices" field */ strcat(regex, ","); strncat(regex, regex_unit, strlen(regex_unit)); } diff --git a/src/util/hash.c b/src/util/hash.c index b5ec6af..42ccff7 100644 --- a/src/util/hash.c +++ b/src/util/hash.c @@ -120,7 +120,7 @@ virHashComputeKey(virHashTablePtr table, const void *name) * * 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, virHashDataFree dataFree, diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 8c53f1f..9b674a9 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -537,7 +537,7 @@ vboxIIDIsEqual_v3_x(vboxGlobalData *data, vboxIID_v3_x *iid1, unsigned char uuid2[VIR_UUID_BUFLEN]; /* 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 * using direct string comparison. Here virUUIDParse() takes * care of these cases. */ -- 1.7.4.4