From d46a9039a595fb8050e785a25726ae18f389cab0 Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
Date: Sun, 29 Nov 2015 08:38:59 +0100
Subject: executor: fix build

---
 executor/executor.cc | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'executor/executor.cc')

diff --git a/executor/executor.cc b/executor/executor.cc
index 50c76b356..614ecae49 100644
--- a/executor/executor.cc
+++ b/executor/executor.cc
@@ -1,7 +1,6 @@
 // Copyright 2015 syzkaller project authors. All rights reserved.
 // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 
-#include "syscalls.h"
 #include <algorithm>
 #include <errno.h>
 #include <fcntl.h>
@@ -26,6 +25,8 @@
 #include <time.h>
 #include <unistd.h>
 
+#include "syscalls.h"
+
 const int kInFd = 3;
 const int kOutFd = 4;
 const int kInPipeFd = 5;
@@ -294,8 +295,7 @@ retry:
 		if (collide && (n % 2)) {
 			// Don't wait for every other call.
 			// We already have results from the previous execution.
-		}
-		else if (flag_threaded) {
+		} else if (flag_threaded) {
 			// Wait for call completion.
 			uint64_t start = current_time_ms();
 			uint64_t now = start;
@@ -326,8 +326,7 @@ retry:
 						handle_completion(th);
 				}
 			}
-		}
-		else {
+		} else {
 			// Execute directly.
 			if (th != &threads[0])
 				fail("using non-main thread in non-thread mode");
@@ -475,8 +474,7 @@ void execute_call(thread_t* th)
 			char buf[128];
 			sprintf(buf, "/dev/pts/%d", ptyno);
 			th->res = open(buf, th->args[1], 0);
-		}
-		else {
+		} else {
 			th->res = -1;
 		}
 	}
-- 
cgit mrf-deployment