createRawFileOpHook: avoid dead stores

* src/storage/storage_backend.c (createRawFileOpHook): Remove dead
stores and declaration of each stored-to variable.

diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c
index 7294a009dcbb6becf01e50fa650e7ea6c3614eb7..f0074ed04c0f3f3914811be8e26d470cb849ecbb 100644 (file)
--- a/src/storage/storage_backend.c
+++ b/src/storage/storage_backend.c
@@ -308,12 +308,11 @@ static int createRawFileOpHook(int fd, void *data) {
                  * update every 9s is a fair-enough trade-off
                  */
                 unsigned long long bytes = 512 * 1024 * 1024;
-                int r;
 
                 if (bytes > remain)
                     bytes = remain;
-                if ((r = safezero(fd, 0, hdata->vol->allocation - remain,
-                                  bytes)) != 0) {
+                if (safezero(fd, 0, hdata->vol->allocation - remain,
+                             bytes) != 0) {
                     ret = errno;
                     virReportSystemError(errno, _("cannot fill file '%s'"),
                                          hdata->vol->target.path);
@@ -322,9 +321,7 @@ static int createRawFileOpHook(int fd, void *data) {
                 remain -= bytes;
             }
         } else { /* No progress bars to be shown */
-            int r;
-
-            if ((r = safezero(fd, 0, 0, remain)) != 0) {
+            if (safezero(fd, 0, 0, remain) != 0) {
                 ret = errno;
                 virReportSystemError(errno, _("cannot fill file '%s'"),
                                      hdata->vol->target.path);