Revert Sarif whitespace changes to unrelated files

Author: sim642

src/incremental/makefileUtil.ml

@@ -9,7 +9,7 @@ let exec_command ?path (command: string) =
   let current_dir = Sys.getcwd () in
   (match path with
    | Some path ->
-      if Sys.file_exists path && Sys.is_directory path then Sys.chdir path
+     if Sys.file_exists path && Sys.is_directory path then Sys.chdir path
      else failwith ("Directory " ^ path ^ " does not exist!")
    | None -> ());
   if GobConfig.get_bool "dbg.verbose" then print_endline ("executing command `" ^ command ^ "` in " ^ Sys.getcwd ());
@@ -18,7 +18,7 @@ let exec_command ?path (command: string) =
   try
     while true do
       let line = input_char std_out in
-      Buffer.add_char output line     
+      Buffer.add_char output line
     done;
     assert false;
   with End_of_file ->
@@ -33,7 +33,7 @@ let string_of_process_status = function
   | WSTOPPED n -> "was stopped by signal " ^ string_of_int n
 
 (* BFS for a file with a given suffix in a directory or any subdirectoy *)
-let find_file_by_suffix (dir: string) (file_name_suffix: string) = 
+let find_file_by_suffix (dir: string) (file_name_suffix: string) =
   let list_files d = Array.to_list @@ Sys.readdir d in
   let dirs = Queue.create () in
   let rec search (dir: string) (files: string list) = match files with
@@ -47,25 +47,23 @@ let find_file_by_suffix (dir: string) (file_name_suffix: string) =
   in
   search dir (list_files dir)
 
-let run_cilly (path: string) =  
-       
+let run_cilly (path: string) =
   if Sys.file_exists path && Sys.is_directory path then (
     (* We need to `make clean` if `make` was run manually, otherwise it would say there is nothing to do and cilly would not be run and no combined C file would be created. *)
     let _ = exec_command ~path "make clean" in
-   (try
+    (try
        while true do
          let comb = find_file_by_suffix path comb_suffix in
          if GobConfig.get_bool "dbg.verbose" then print_endline ("deleting " ^ comb);
          Sys.remove comb;
        done
      with Failure e -> ()); (* Deleted all *_comb.c files in the directory *)
     (* Combine source files with make using cilly as compiler *)
-    let gcc_path = GobConfig.get_string "exp.gcc_path" in     
+    let gcc_path = GobConfig.get_string "exp.gcc_path" in
     let (exit_code, output) = exec_command ~path ("make CC=\"cilly --gcc=" ^ gcc_path ^ " --merge --keepmerged\" " ^
                                                   "LD=\"cilly --gcc=" ^ gcc_path ^ " --merge --keepmerged\"") in
-    
+    print_string output;
     (* fail if make failed *)
-    if exit_code <> WEXITED  0 then
+    if exit_code <> WEXITED 0 then
       failwith ("Failed combining files. Make " ^ (string_of_process_status exit_code) ^ ".")
-    
   )

src/maingoblint.ml

@@ -291,6 +291,7 @@ let merge_preprocessed cpp_file_names =
   if get_bool "dbg.verbose" then print_endline "Parsing files.";
   let files_AST = List.rev_map Cilfacade.getAST cpp_file_names in
   remove_temp_dir ();
+
   let cilout =
     if get_string "dbg.cilout" = "" then Legacy.stderr else Legacy.open_out (get_string "dbg.cilout")
   in