Get rid of the unused "pinfo" argument to "dissect_osi_options()".

svn path=/trunk/; revision=5110

4 files changed, 12 insertions, 18 deletions

diff --git a/packet-clnp.c b/packet-clnp.c
index 4cce57d479..c17f4a929f 100644
--- a/packet-clnp.c
+++ b/packet-clnp.c
@@ -1,7 +1,7 @@
 /* packet-clnp.c
  * Routines for ISO/OSI network and transport protocol packet disassembly
  *
- * $Id: packet-clnp.c,v 1.52 2002/03/31 21:36:05 guy Exp $
+ * $Id: packet-clnp.c,v 1.53 2002/04/07 21:54:48 guy Exp $
  * Laurent Deniel <deniel@worldnet.fr>
  * Ralf Schneider <Ralf.Schneider@t-online.de>
  *
@@ -1804,7 +1804,7 @@ static void dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
     dissect_osi_options( 0xff, 
                          opt_len,
-                         tvb, offset, pinfo, clnp_tree ); 
+                         tvb, offset, clnp_tree ); 
   }
 
   /* Length of CLNP datagram plus headers above it. */
diff --git a/packet-esis.c b/packet-esis.c
index 3aa0847c47..c6a33d141b 100644
--- a/packet-esis.c
+++ b/packet-esis.c
@@ -2,7 +2,7 @@
  * Routines for ISO/OSI End System to Intermediate System  
  * Routing Exchange Protocol ISO 9542.
  *
- * $Id: packet-esis.c,v 1.22 2002/01/24 09:20:47 guy Exp $
+ * $Id: packet-esis.c,v 1.23 2002/04/07 21:54:48 guy Exp $
  * Ralf Schneider <Ralf.Schneider@t-online.de>
  *
  * Ethereal - Network traffic analyzer
@@ -185,7 +185,7 @@ esis_dissect_esh_pdu( u_char len, tvbuff_t *tvb, packet_info *pinfo,
        offset += sal;
        len    -= ( sal + 1 );
     }
-    dissect_osi_options( PDU_TYPE_ESIS_ESH, len, tvb, offset, pinfo, tree );
+    dissect_osi_options( PDU_TYPE_ESIS_ESH, len, tvb, offset, tree );
   }  
 } /* esis_dissect_esh_pdu */ ;
 
@@ -209,7 +209,7 @@ esis_dissect_ish_pdu( u_char len, tvbuff_t *tvb, packet_info *pinfo,
     offset += netl;
     len    -= ( netl + 1 );
 
-    dissect_osi_options( PDU_TYPE_ESIS_ISH, len, tvb, offset, pinfo, tree );
+    dissect_osi_options( PDU_TYPE_ESIS_ISH, len, tvb, offset, tree );
   }
 };
 
@@ -260,7 +260,7 @@ esis_dissect_redirect_pdu( u_char len, tvbuff_t *tvb, packet_info *pinfo,
       offset += tmpl;
       len    -= ( tmpl + 1 );
     }
-    dissect_osi_options( PDU_TYPE_ESIS_RD, len, tvb, offset, pinfo, tree );
+    dissect_osi_options( PDU_TYPE_ESIS_RD, len, tvb, offset, tree );
   }
 }
 
diff --git a/packet-osi-options.c b/packet-osi-options.c
index 43640850ec..63d60b3371 100644
--- a/packet-osi-options.c
+++ b/packet-osi-options.c
@@ -5,7 +5,7 @@
  * ISO 10589 ISIS (Intradomain Routing Information Exchange Protocol)
  * ISO  9542 ESIS (End System To Intermediate System Routing Exchange Protocol)
  *
- * $Id: packet-osi-options.c,v 1.9 2002/01/21 07:36:38 guy Exp $
+ * $Id: packet-osi-options.c,v 1.10 2002/04/07 21:54:48 guy Exp $
  * Ralf Schneider <Ralf.Schneider@t-online.de>
  *
  * Ethereal - Network traffic analyzer
@@ -25,8 +25,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- *
  */
 
 #ifdef HAVE_CONFIG_H
@@ -342,10 +340,9 @@ dissect_option_rfd( const u_char error, const u_char field, u_char offset,
  * Input:
  *   u_char       : PDU type to check if option is allowed or not
  *   u_char       : length of option section 
- *   u_char *     : packet data
+ *   tvbuff_t *   : tvbuff containing packet data
  *   int          : offset into packet where we are (packet_data[offset]== start
  *                  of what we care about)
- *   frame_data * : frame data (whole packet with extra info)
  *   proto_tree * : tree of display data.  May be NULL.
  *
  * Output:
@@ -353,7 +350,7 @@ dissect_option_rfd( const u_char error, const u_char field, u_char offset,
  */
 void
 dissect_osi_options( u_char pdu_type, u_char opt_len, tvbuff_t *tvb, 
-                     int offset, packet_info *pinfo, proto_tree *tree) {
+                     int offset, proto_tree *tree) {
    proto_item *ti;
    proto_tree *osi_option_tree = NULL;
    u_char      parm_len        = 0;
diff --git a/packet-osi-options.h b/packet-osi-options.h
index d3b760d800..388495be63 100644
--- a/packet-osi-options.h
+++ b/packet-osi-options.h
@@ -1,13 +1,12 @@
 /* packet-osi-options.h
  * Defines for OSI options part decode 
  *
- * $Id: packet-osi-options.h,v 1.2 2000/11/18 10:38:24 guy Exp $
+ * $Id: packet-osi-options.h,v 1.3 2002/04/07 21:54:48 guy Exp $
  * Ralf Schneider <Ralf.Schneider@t-online.de>
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 Gerald Combs
- *
  * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -22,8 +21,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- *
  */
 
 #ifndef _PACKET_OSI_OPTION_H
@@ -33,7 +30,7 @@
  * published API functions
  */ 
 extern void dissect_osi_options( u_char, u_char, tvbuff_t *, int,
-                                 packet_info *, proto_tree *);
+                                 proto_tree *);
 extern void proto_register_osi_options(void);
 
 #endif /* _PACKET_OSI_OPTIONS_H */