Bug 1287739: Always set 'len' variable in storage test, r=mak

MozReview-Commit-ID: 8EpGeakICWY
iaxat · Jul 20, 2016 · 3eace08 · 3eace08
1 parent 2677e26
commit 3eace08
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/storage/test/test_deadlock_detector.cpp b/storage/test/test_deadlock_detector.cpp
@@ -160,7 +160,6 @@ class Subprocess
         int32_t nfds;
         bool stdoutOpen = true, stderrOpen = true;
         char buf[4096];
-        int32_t len;
 
         PRIntervalTime now = PR_IntervalNow();
         PRIntervalTime deadline = now + PR_MillisecondsToInterval(aWaitMs);
@@ -194,15 +193,13 @@ class Subprocess
                     continue;
 
                 bool isStdout = mStdoutfd == pollfds[i].fd;
-
+                int32_t len = 0;
+
                 if (PR_POLL_READ & pollfds[i].out_flags) {
                     len = PR_Read(pollfds[i].fd, buf, sizeof(buf) - 1);
                     NS_ASSERTION(0 <= len, PR_ErrorToName(PR_GetError()));
                 }
-                else if (PR_POLL_HUP & pollfds[i].out_flags) {
-                    len = 0;
-                }
-                else {
+                else if (!(PR_POLL_HUP & pollfds[i].out_flags)) {
                     NS_ERROR(PR_ErrorToName(PR_GetError()));
                 }