shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 17:34:18 +03:00
Code Releases Activity

maint: fix grammar errors

Browse Source 
Jim Meyering recently improved gnulib to catch various grammar
errors during 'make syntax-check'.

* .gnulib: Update to latest, for syntax-check improvements.
* include/libvirt/libvirt.h.in (virConnectAuthCallbackPtr): Use
cannot rather than two words.
* src/driver.c: Likewise.
* src/driver.h (VIR_SECRET_GET_VALUE_INTERNAL_CALL): Likewise.
* src/remote/remote_driver.c (initialize_gnutls): Likewise.
* src/util/pci.c (pciBindDeviceToStub): Likewise.
* src/storage/storage_backend.c (virStorageBackendCreateQemuImg):
Likewise.
(virStorageBackendUpdateVolTargetInfoFD): Avoid doubled word.
* docs/formatdomain.html.in: Likewise.
* src/qemu/qemu_process.c (qemuProcessStart): Likewise.
* cfg.mk (exclude_file_name_regexp--sc_prohibit_can_not)
(exclude_file_name_regexp--sc_prohibit_doubled_word): Exclude
existing translation problems.
This commit is contained in:
Eric Blake 2011-04-11 16:25:25 -06:00
parent 0ddc8d0aeb
commit 99fa30804b
10 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gnulib

@ -1 +1 @@
Subproject commit 4a1579d7560659ef5723325726eda14490a967f6 Subproject commit fb799692f5bb43310424977e0ca15599fc68d776

4
cfg.mk
View File

@ -573,9 +573,13 @@ exclude_file_name_regexp--sc_prohibit_always_true_header_tests = \
exclude_file_name_regexp--sc_prohibit_asprintf = \ exclude_file_name_regexp--sc_prohibit_asprintf = \
^(bootstrap.conf$$|po/|src/util/util\.c$$|examples/domain-events/events-c/event-test\.c$$) ^(bootstrap.conf$$|po/|src/util/util\.c$$|examples/domain-events/events-c/event-test\.c$$)
exclude_file_name_regexp--sc_prohibit_can_not = ^po/
exclude_file_name_regexp--sc_prohibit_close = \ exclude_file_name_regexp--sc_prohibit_close = \
(\.py$$|^docs/|(src/util/files\.c|src/libvirt\.c)$$) (\.py$$|^docs/|(src/util/files\.c|src/libvirt\.c)$$)
exclude_file_name_regexp--sc_prohibit_doubled_word = ^po/
exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = \ exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = \
(^docs/api_extension/|^tests/qemuhelpdata/|\.(gif|ico|png)$$) (^docs/api_extension/|^tests/qemuhelpdata/|\.(gif|ico|png)$$)

2
docs/formatdomain.html.in
View File

@ -774,7 +774,7 @@
<span class="since">Since 0.0.3; "device" attribute since 0.1.4; <span class="since">Since 0.0.3; "device" attribute since 0.1.4;
"network" attribute since 0.8.7</span></dd> "network" attribute since 0.8.7</span></dd>
<dt><code>source</code></dt> <dt><code>source</code></dt>
<dd>If the disk <code>type</code> is "file", then the <dd>If the disk <code>type</code> is "file", then
the <code>file</code> attribute specifies the fully-qualified the <code>file</code> attribute specifies the fully-qualified
path to the file holding the disk. If the disk path to the file holding the disk. If the disk
<code>type</code> is "block", then the <code>dev</code> <code>type</code> is "block", then the <code>dev</code>

2
include/libvirt/libvirt.h.in
View File

@ -505,7 +505,7 @@ typedef virConnectCredential *virConnectCredentialPtr;
* When authentication requires one or more interactions, this callback * When authentication requires one or more interactions, this callback
* is invoked. For each interaction supplied, data must be gathered * is invoked. For each interaction supplied, data must be gathered
* from the user and filled in to the 'result' and 'resultlen' fields. * from the user and filled in to the 'result' and 'resultlen' fields.
* If an interaction can not be filled, fill in NULL and 0. * If an interaction cannot be filled, fill in NULL and 0.
* *
* Returns 0 if all interactions were filled, or -1 upon error * Returns 0 if all interactions were filled, or -1 upon error
*/ */

4
src/driver.c
View File

@ -1,7 +1,7 @@
/* /*
* driver.c: Helpers for loading drivers * driver.c: Helpers for loading drivers
* *
* Copyright (C) 2006-2010 Red Hat, Inc. * Copyright (C) 2006-2011 Red Hat, Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -32,7 +32,7 @@
#define DEFAULT_DRIVER_DIR LIBDIR "/libvirt/connection-driver" #define DEFAULT_DRIVER_DIR LIBDIR "/libvirt/connection-driver"
/* Make sure ... INTERNAL_CALL can not be set by the caller */ /* Make sure ... INTERNAL_CALL cannot be set by the caller */
verify((VIR_SECRET_GET_VALUE_INTERNAL_CALL & verify((VIR_SECRET_GET_VALUE_INTERNAL_CALL &
VIR_SECRET_GET_VALUE_FLAGS_MASK) == 0); VIR_SECRET_GET_VALUE_FLAGS_MASK) == 0);

2
src/driver.h
View File

@ -1063,7 +1063,7 @@ struct _virDeviceMonitor {
enum { enum {
/* This getValue call is inside libvirt, override the "private" flag. /* This getValue call is inside libvirt, override the "private" flag.
This flag can not be set by outside callers. */ This flag cannot be set by outside callers. */
VIR_SECRET_GET_VALUE_INTERNAL_CALL = 1 << 16 VIR_SECRET_GET_VALUE_INTERNAL_CALL = 1 << 16
}; };

2
src/qemu/qemu_process.c
View File

@ -2326,7 +2326,7 @@ int qemuProcessStart(virConnectPtr conn,
ret = virCommandRun(cmd, NULL); ret = virCommandRun(cmd, NULL);
VIR_FREE(pidfile); VIR_FREE(pidfile);
/* wait for qemu process to to show up */ /* wait for qemu process to show up */
if (ret == 0) { if (ret == 0) {
if (virFileReadPid(driver->stateDir, vm->def->name, &vm->pid)) { if (virFileReadPid(driver->stateDir, vm->def->name, &vm->pid)) {
qemuReportError(VIR_ERR_INTERNAL_ERROR, qemuReportError(VIR_ERR_INTERNAL_ERROR,

2
src/remote/remote_driver.c
View File

@ -1223,7 +1223,7 @@ initialize_gnutls(char *pkipath, int flags)
goto out_of_memory; goto out_of_memory;
/* Use default location as long as one of CA certificate, /* Use default location as long as one of CA certificate,
* client key, and client certificate can not be found in * client key, and client certificate cannot be found in
* $HOME/.pki/libvirt, we don't want to make user confused * $HOME/.pki/libvirt, we don't want to make user confused
* with one file is here, the other is there. * with one file is here, the other is there.
*/ */

4
src/storage/storage_backend.c
View File

@ -703,7 +703,7 @@ virStorageBackendCreateQemuImg(virConnectPtr conn,
(!inputBackingPath || (!inputBackingPath ||
STRNEQ(inputBackingPath, vol->backingStore.path))) { STRNEQ(inputBackingPath, vol->backingStore.path))) {
virStorageReportError(VIR_ERR_INTERNAL_ERROR, virStorageReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("a different backing store can not " "%s", _("a different backing store cannot "
"be specified.")); "be specified."));
return -1; return -1;
} }
@ -1188,7 +1188,7 @@ virStorageBackendUpdateVolTargetInfoFD(virStorageVolTargetPtr target,
*capacity = sb.st_size; *capacity = sb.st_size;
} else { } else {
off_t end; off_t end;
/* XXX this is POSIX compliant, but doesn't work for for CHAR files, /* XXX this is POSIX compliant, but doesn't work for CHAR files,
* only BLOCK. There is a Linux specific ioctl() for getting * only BLOCK. There is a Linux specific ioctl() for getting
* size of both CHAR / BLOCK devices we should check for in * size of both CHAR / BLOCK devices we should check for in
* configure * configure

6
src/util/pci.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2009-2010 Red Hat, Inc. * Copyright (C) 2009-2011 Red Hat, Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -1073,7 +1073,7 @@ remove_id:
* ID table so that 'drivers_probe' works below. * ID table so that 'drivers_probe' works below.
*/ */
if (pciDriverFile(&path, driver, "remove_id") < 0) { if (pciDriverFile(&path, driver, "remove_id") < 0) {
/* We do not remove PCI ID from pci-stub, and we can not reprobe it */ /* We do not remove PCI ID from pci-stub, and we cannot reprobe it */
if (dev->reprobe) { if (dev->reprobe) {
VIR_WARN("Could not remove PCI ID '%s' from %s, and the device " VIR_WARN("Could not remove PCI ID '%s' from %s, and the device "
"cannot be probed again.", dev->id, driver); "cannot be probed again.", dev->id, driver);
@ -1087,7 +1087,7 @@ remove_id:
_("Failed to remove PCI ID '%s' from %s"), _("Failed to remove PCI ID '%s' from %s"),
dev->id, driver); dev->id, driver);
/* remove PCI ID from pci-stub failed, and we can not reprobe it */ /* remove PCI ID from pci-stub failed, and we cannot reprobe it */
if (dev->reprobe) { if (dev->reprobe) {
VIR_WARN("Failed to remove PCI ID '%s' from %s, and the device " VIR_WARN("Failed to remove PCI ID '%s' from %s, and the device "
"cannot be probed again.", dev->id, driver); "cannot be probed again.", dev->id, driver);