External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-06 09:55:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid new "make syntax-check" failures.

Browse Source 
* .x-sc_avoid_write: Exempt src/util-lib.c, too.
* Makefile.maint (sc_unmarked_diagnostics): Filter out false positives.
* src/storage_backend_fs.c (virStorageBackendFileSystemVolCreate):
Use safewrite, not write.
* src/storage_backend_logical.c (virStorageBackendLogicalBuildPool): Likewise.
This commit is contained in:
Jim Meyering 2008-02-25 10:00:16 +00:00
parent b1b23f76be
commit e497deb89e
5 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.x-sc_avoid_write
View File

@ -1,2 +1,3 @@
^src/util\.c$
^src/xend_internal\.c$
^src/util-lib\.c$

10
ChangeLog
View File

@ -1,3 +1,13 @@
Mon Feb 25 10:59:43 CET 2008 Jim Meyering <meyering@redhat.com>
Avoid new "make syntax-check" failures.
* .x-sc_avoid_write: Exempt src/util-lib.c, too.
* Makefile.maint (sc_unmarked_diagnostics): Filter out false positives.
* src/storage_backend_fs.c (virStorageBackendFileSystemVolCreate):
Use safewrite, not write.
* src/storage_backend_logical.c (virStorageBackendLogicalBuildPool):
Likewise.
Fri Feb 22 13:32:11 CET 2008 Jim Meyering <meyering@redhat.com>
avoid format string warnings

6
Makefile.maint
View File

@ -304,6 +304,9 @@ err_func_re = \
# Look for diagnostics that aren't marked for translation.
# This won't find any for which error's format string is on a separate line.
# The sed filters eliminate false-positives like these:
# _("...: "
# "%s", _("no storage vol w..."
sc_unmarked_diagnostics:
@grep -nE \
'\<(vshError|error) \([^"]*"[^"]*[a-z]{3}' $$($(CVS_LIST_EXCEPT)) \
@ -312,7 +315,8 @@ sc_unmarked_diagnostics:
exit 1; } || :
@{ grep -nE '\<$(err_func_re) *\(.*;$$' $$($(CVS_LIST_EXCEPT)); \
grep -A1 -nE '\<$(err_func_re) *\(.*,$$' $$($(CVS_LIST_EXCEPT)); } \
| grep '[ ]"' && \
| sed 's/_("[^"][^"]*"//;s/[ ]"%s"//' \
| grep '[ ]"' && \
{ echo '$(ME): found unmarked diagnostic(s)' 1>&2; \
exit 1; } || :

2
src/storage_backend_fs.c
View File

@ -854,7 +854,7 @@ virStorageBackendFileSystemVolCreate(virConnectPtr conn,
int bytes = sizeof(zeros);
if (bytes > remain)
bytes = remain;
if ((bytes = write(fd, zeros, bytes)) < 0) {
if ((bytes = safewrite(fd, zeros, bytes)) < 0) {
virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR,
_("cannot fill file '%s': %s"),
vol->target.path, strerror(errno));

2
src/storage_backend_logical.c
View File

@ -287,7 +287,7 @@ virStorageBackendLogicalBuildPool(virConnectPtr conn,
strerror(errno));
goto cleanup;
}
if (write(fd, zeros, sizeof(zeros)) != sizeof(zeros)) {
if (safewrite(fd, zeros, sizeof(zeros)) < 0) {
virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR,
_("cannot clear device header %s"),
strerror(errno));