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/PackedStructs.ml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'cparser/PackedStructs.ml')

diff --git a/cparser/PackedStructs.ml b/cparser/PackedStructs.ml
index 6ea5d121..6a60dfb8 100644
--- a/cparser/PackedStructs.ml
+++ b/cparser/PackedStructs.ml
@@ -127,10 +127,10 @@ let transf_composite loc env su id attrs ml =
 
 (* Accessor functions *)
 
-let lookup_function loc env name =
+let lookup_function env name =
   match Env.lookup_ident env name with
-  | (id, II_ident(sto, ty)) -> (id, ty)
-  | (id, II_enum _) -> raise (Env.Error(Env.Unbound_identifier name))
+  | (id, II_ident(_, ty)) -> (id, ty)
+  | (_, II_enum _) -> raise (Env.Error(Env.Unbound_identifier name))
 
 (* Type for the access *)
 
@@ -161,14 +161,14 @@ let bswap_read loc env lval =
   try
     if !use_reversed then begin
       let (id, fty) =
-        lookup_function loc env (sprintf "__builtin_read%d_reversed" bsize) in
+        lookup_function env (sprintf "__builtin_read%d_reversed" bsize) in
       let fn = {edesc = EVar id; etyp = fty} in
       let args = [ecast_opt env (TPtr(aty,[])) (eaddrof lval)] in
       let call = {edesc = ECall(fn, args); etyp = aty} in
       ecast_opt env ty call
     end else begin
       let (id, fty) =
-        lookup_function loc env (sprintf "__builtin_bswap%d" bsize) in
+        lookup_function env (sprintf "__builtin_bswap%d" bsize) in
       let fn = {edesc = EVar id; etyp = fty} in
       let args = [ecast_opt env aty lval] in
       let call = {edesc = ECall(fn, args); etyp = aty} in
@@ -188,14 +188,14 @@ let bswap_write loc env lhs rhs =
   try
     if !use_reversed then begin
       let (id, fty) =
-        lookup_function loc env (sprintf "__builtin_write%d_reversed" bsize) in
+        lookup_function env (sprintf "__builtin_write%d_reversed" bsize) in
       let fn = {edesc = EVar id; etyp = fty} in
       let args = [ecast_opt env (TPtr(aty,[])) (eaddrof lhs);
                   ecast_opt env aty rhs] in
       {edesc = ECall(fn, args); etyp = TVoid[]}
     end else begin
       let (id, fty) =
-        lookup_function loc env (sprintf "__builtin_bswap%d" bsize) in
+        lookup_function env (sprintf "__builtin_bswap%d" bsize) in
       let fn = {edesc = EVar id; etyp = fty} in
       let args = [ecast_opt env aty rhs] in
       let call = {edesc = ECall(fn, args); etyp = aty} in
@@ -387,7 +387,7 @@ let rec transf_globdecls env accu = function
   | [] -> List.rev accu
   | g :: gl ->
       match g.gdesc with
-      | Gdecl((sto, id, ty, init) as d) ->
+      | Gdecl((sto, id, ty, _) as d) ->
           transf_globdecls
             (Env.add_ident env id sto ty)
             ({g with gdesc = Gdecl(transf_decl g.gloc env d)} :: accu)
@@ -403,7 +403,7 @@ let rec transf_globdecls env accu = function
             | Union -> attr
             | Struct -> remove_custom_attributes  ["packed";"__packed__"] attr in
           transf_globdecls
-            (Env.add_composite env id (composite_info_decl env su attr'))
+            (Env.add_composite env id (composite_info_decl su attr'))
             ({g with gdesc = Gcompositedecl(su, id, attr')} :: accu)
             gl
       | Gcompositedef(su, id, attr, fl) ->
@@ -422,7 +422,7 @@ let rec transf_globdecls env accu = function
             (Env.add_enum env id {ei_members =  el; ei_attr = attr})
             (g :: accu)
             gl
-      | Gpragma p ->
+      | Gpragma _ ->
           transf_globdecls env (g :: accu) gl
 
 (* Program *)
-- 
cgit