From 7266b79d603f10565a4bc3fd570e9c4eb7e39024 Mon Sep 17 00:00:00 2001
From: Anukriti12 <anu1999kriti@gmail.com>
Date: Thu, 2 Apr 2020 16:38:54 +0530
Subject: [PATCH] code review changes

---
 asmcomp/asmlink.ml     | 4 ++--
 asmcomp/asmpackager.ml | 6 +++---
 bytecomp/bytelink.ml   | 5 ++++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/asmcomp/asmlink.ml b/asmcomp/asmlink.ml
index 9199eea05..8d53b5429 100644
--- a/asmcomp/asmlink.ml
+++ b/asmcomp/asmlink.ml
@@ -282,7 +282,7 @@ let make_shared_startup_file ~ppf_dump units =
 let call_linker_shared file_list output_name =
   let exitcode = Ccomp.call_linker Ccomp.Dll output_name file_list "" in
   if not (exitcode = 0)
-  then raise(Error(Linking_error (exitcode)))
+  then raise(Error(Linking_error exitcode))
 
 let link_shared ~ppf_dump objfiles output_name =
   Profile.record_call output_name (fun () ->
@@ -336,7 +336,7 @@ let call_linker file_list startup_file output_name =
   in
   let exitcode = Ccomp.call_linker mode output_name files c_lib in
   if not (exitcode = 0)
-  then raise(Error(Linking_error (exitcode)))
+  then raise(Error(Linking_error exitcode))
 
 (* Main entry point *)
 
diff --git a/asmcomp/asmpackager.ml b/asmcomp/asmpackager.ml
index 522eb6daa..604fac5e5 100644
--- a/asmcomp/asmpackager.ml
+++ b/asmcomp/asmpackager.ml
@@ -141,11 +141,11 @@ let make_package_object ~ppf_dump members targetobj targetname coercion
       List.map
         (fun m -> Filename.remove_extension m.pm_file ^ Config.ext_obj)
         (List.filter (fun m -> m.pm_kind <> PM_intf) members) in
-    let ok =
-      Ccomp.call_linker Ccomp.Partial targetobj (objtemp :: objfiles) "" = 0
+    let exitcode =
+      Ccomp.call_linker Ccomp.Partial targetobj (objtemp :: objfiles) ""
     in
     remove_file objtemp;
-    if not ok then raise(Error Linking_error)
+    if not (exitcode = 0) then raise(Error Linking_error)
   )
 
 (* Make the .cmx file for the package *)
diff --git a/bytecomp/bytelink.ml b/bytecomp/bytelink.ml
index 7e5d5e53d..62216de62 100644
--- a/bytecomp/bytelink.ml
+++ b/bytecomp/bytelink.ml
@@ -575,9 +575,12 @@ let build_custom_runtime prim_name exec_name =
       [Printf.sprintf "-fdebug-prefix-map=%s=camlprim.c" prim_name]
     else
       [] in
+  let exitcode =
+    (Clflags.std_include_flag "-I" ^ " " ^ Config.bytecomp_c_libraries)
+  in
   Ccomp.call_linker Ccomp.Exe exec_name
     (debug_prefix_map @ [prim_name] @ List.rev !Clflags.ccobjs @ [runtime_lib])
-    (Clflags.std_include_flag "-I" ^ " " ^ Config.bytecomp_c_libraries) = 0
+    exitcode = 0
 
 let append_bytecode bytecode_name exec_name =
   let oc = open_out_gen [Open_wronly; Open_append; Open_binary] 0 exec_name in