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.

diff --git a/.x-sc_avoid_write b/.x-sc_avoid_write
index 72a196d1388a9a621f7b5927280085e3609021e7..fe38d837a1793a96c45233e3e22bc8a2a2577845 100644 (file)
--- a/.x-sc_avoid_write
+++ b/.x-sc_avoid_write
@@ -1,2 +1,3 @@
 ^src/util\.c$
 ^src/xend_internal\.c$
+^src/util-lib\.c$

diff --git a/ChangeLog b/ChangeLog
index d780ff8eba14506b5e3531109b50773e3f27a2b2..be6b623a381605907666d0eb686e7c2e5ed0a566 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/Makefile.maint b/Makefile.maint
index fe964a57130b7efb6ce2abb0731944442ea0f9d1..92cdf2973bbaa20fd4ea22e017545b0f28572f6b 100644 (file)
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -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; } || :
 

diff --git a/src/storage_backend_fs.c b/src/storage_backend_fs.c
index 9425cbc2f32c18c1781f6c0f1e872a8bcb72278f..1d540e149c5bceb2fe9d35413c0ac51e44c12035 100644 (file)
--- a/src/storage_backend_fs.c
+++ b/src/storage_backend_fs.c
@@ -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));

diff --git a/src/storage_backend_logical.c b/src/storage_backend_logical.c
index a70c0879f4425ccdd705ee9d9be97751d7d7dbcf..f8a075dead1ba50d73b6b0e9b2ee3b44eaa4c41d 100644 (file)
--- a/src/storage_backend_logical.c
+++ b/src/storage_backend_logical.c
@@ -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));