From 5b05d3668571bd9b748b781b0cc29ae10f745f61 Mon Sep 17 00:00:00 2001
From: Bernhard Schommer <bernhardschommer@gmail.com>
Date: Thu, 10 Mar 2016 13:35:48 +0100
Subject: Code cleanup.

Removed some unused variables, functions etc. and resolved some
problems which occur if all warnings except 3,4,9 and 29 are active.
Bug 18394.
---
 cparser/StructReturn.ml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'cparser/StructReturn.ml')

diff --git a/cparser/StructReturn.ml b/cparser/StructReturn.ml
index 4e019380..95f133bd 100644
--- a/cparser/StructReturn.ml
+++ b/cparser/StructReturn.ml
@@ -19,7 +19,7 @@
 
 open Machine
 open Configuration
-open C
+open !C
 open Cutil
 open Transform
 
@@ -217,7 +217,7 @@ let rec transf_type env t =
           TFun(tres', None, vararg, attr)
       | Ret_ref ->
           TFun(TVoid [], None, vararg, add_attributes attr attr_structret)
-      | Ret_value(ty, sz, al) ->
+      | Ret_value(ty, _, _) ->
           TFun(ty, None, vararg, attr)
       end
   | TFun(tres, Some args, vararg, attr) ->
@@ -230,7 +230,7 @@ let rec transf_type env t =
           let res = Env.fresh_ident "_res" in
           TFun(TVoid [], Some((res, TPtr(tres', [])) :: args'), vararg,
                add_attributes attr attr_structret)
-      | Ret_value(ty, sz, al) ->
+      | Ret_value(ty, _, _) ->
           TFun(ty, Some args', vararg, attr)
       end
   | TPtr(t1, attr) ->
@@ -251,7 +251,7 @@ and transf_funargs env = function
           (id, t') :: args'
       | Param_ref_caller ->
           (id, TPtr(t', [])) :: args'
-      | Param_flattened(n, sz, al) ->
+      | Param_flattened(n, _, _) ->
           list_map_n (fun _ -> (Env.fresh_ident id.name, uint)) n
           @ args'
 
@@ -261,7 +261,7 @@ let rec translates_to_extended_lvalue arg =
   is_lvalue arg ||
   (match arg.edesc with
    | ECall _ -> true
-   | EBinop(Ocomma, a, b, _) -> translates_to_extended_lvalue b
+   | EBinop(Ocomma, _, b, _) -> translates_to_extended_lvalue b
    | _ -> false)
 
 let rec transf_expr env ctx e =
@@ -279,7 +279,7 @@ let rec transf_expr env ctx e =
       {edesc = EUnop(op, transf_expr env Val e1); etyp = newty}
   | EBinop(Oassign, lhs, {edesc = ECall(fn, args); etyp = ty}, _) ->
       transf_call env ctx (Some (transf_expr env Val lhs)) fn args ty
-  | EBinop(Ocomma, e1, e2, ty) ->
+  | EBinop(Ocomma, e1, e2, _) ->
       ecomma (transf_expr env Effects e1) (transf_expr env ctx e2)
   | EBinop(op, e1, e2, ty) ->
       {edesc = EBinop(op, transf_expr env Val e1,
@@ -349,7 +349,7 @@ and transf_call env ctx opt_lhs fn args ty =
               ecomma {edesc = ECall(fn', eaddrof tmp :: args'); etyp = TVoid []}
                      (eassign lhs tmp)
           end
-      | Ret_value(ty_ret, sz, al) ->
+      | Ret_value(ty_ret, _, _) ->
           let ecall = {edesc = ECall(fn', args'); etyp = ty_ret} in
           begin match ctx, opt_lhs with
           | Effects, None ->
@@ -461,7 +461,7 @@ let rec transf_stmt s =
       {s with sdesc = Sswitch(transf_expr Val e, transf_stmt s1)}
   | Slabeled(lbl, s1) ->
       {s with sdesc = Slabeled(lbl, transf_stmt s1)}
-  | Sgoto lbl -> s
+  | Sgoto _ -> s
   | Sreturn None -> s
   | Sreturn(Some e) ->
       let e' = transf_expr Val e in
@@ -524,7 +524,7 @@ let rec transf_funparams loc env params =
           ((x, tpx) :: params',
            actions,
            IdentMap.add x estarx subst)
-      | Param_flattened(n, sz, al) ->
+      | Param_flattened(n, _, _) ->
           let y = new_temp ~name:x.name (ty_buffer n) in
           let yparts = list_map_n (fun _ -> Env.fresh_ident x.name) n in
           let assign_part e p act =
@@ -559,7 +559,7 @@ let transf_fundef env f =
          TVoid [],
          (vres, tres) :: params,
          transf_funbody env (subst_stmt subst f.fd_body) (Some eeres))
-    | Ret_value(ty, sz, al) ->
+    | Ret_value(ty, _, _) ->
         (f.fd_attrib,
          ty,
          params,
@@ -573,7 +573,7 @@ let transf_fundef env f =
 
 (* Composites *)
 
-let transf_composite env su id attr fl =
+let transf_composite env _ _ attr fl =
   (attr, List.map (fun f -> {f with fld_typ = transf_type env f.fld_typ}) fl)
 
 (* Entry point *)
@@ -591,5 +591,5 @@ let program p =
     ~decl:transf_decl
     ~fundef:transf_fundef
     ~composite:transf_composite
-    ~typedef:(fun env id ty -> transf_type env ty)
+    ~typedef:(fun env _ ty -> transf_type env ty)
     p
-- 
cgit