Get rid of NullTVB, the "compat_top_tvb" member of the "packet_info"

structure, the check for a null tvbuff pointer in "alloc_field_info()",
and the "tvb_create_from_top()" macro; they're no longer needed, as
there's no non-tvbuffified dissector code remaining.

svn path=/trunk/; revision=4205

5 files changed, 7 insertions, 23 deletions

diff --git a/epan/packet.c b/epan/packet.c
index 2dcf91a339..e3190a2fa4 100644
--- a/epan/packet.c
+++ b/epan/packet.c
@@ -1,7 +1,7 @@
 /* packet.c
  * Routines for packet disassembly
  *
- * $Id: packet.c,v 1.37 2001/10/31 05:59:19 guy Exp $
+ * $Id: packet.c,v 1.38 2001/11/15 10:58:50 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -189,8 +189,6 @@ dissect_packet(tvbuff_t **p_tvb, union wtap_pseudo_header *pseudo_header,
 		*p_tvb = tvb_new_real_data(pd, fd->cap_len, fd->pkt_len, "Frame");
 	/* Add this tvbuffer into the data_src list */
                 fd->data_src = g_slist_append( fd->data_src, *p_tvb);
-
-		pi.compat_top_tvb = *p_tvb;
 	}
 	CATCH(BoundsError) {
 		g_assert_not_reached();
diff --git a/epan/packet_info.h b/epan/packet_info.h
index 6b603117ee..a9f49dccae 100644
--- a/epan/packet_info.h
+++ b/epan/packet_info.h
@@ -1,7 +1,7 @@
 /* packet_info.h
  * Definitions for packet info structures and routines
  *
- * $Id: packet_info.h,v 1.8 2001/11/03 00:58:52 guy Exp $
+ * $Id: packet_info.h,v 1.9 2001/11/15 10:58:51 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -90,7 +90,6 @@ typedef enum {
 typedef struct _packet_info {
   const char *current_proto;	/* name of protocol currently being dissected */
   frame_data *fd;
-  tvbuff_t *compat_top_tvb;	/* only needed while converting Ethereal to use tvbuffs */
   union wtap_pseudo_header *pseudo_header;
   int     len;
   int     captured_len;
diff --git a/epan/proto.c b/epan/proto.c
index 2955e54ee7..3406253cf4 100644
--- a/epan/proto.c
+++ b/epan/proto.c
@@ -1,7 +1,7 @@
 /* proto.c
  * Routines for protocol tree
  *
- * $Id: proto.c,v 1.41 2001/11/03 11:42:50 guy Exp $
+ * $Id: proto.c,v 1.42 2001/11/15 10:58:51 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -1013,8 +1013,6 @@ proto_tree_set_uint64(field_info *fi, const guint8 *value_ptr, gboolean little_e
 static void
 proto_tree_set_uint64_tvb(field_info *fi, tvbuff_t *tvb, gint start, gboolean little_endian)
 {
-	/* XXX remove all this when last non-tvbuff dissector is removed*/
-	NullTVB;
 	proto_tree_set_uint64(fi, tvb_get_ptr(tvb, start, 8), little_endian);
 }
 
@@ -1520,12 +1518,7 @@ alloc_field_info(int hfindex, tvbuff_t *tvb, gint start, gint length)
 	fi->value = fvalue_new(fi->hfinfo->type);
 
 	/* add the data source name */
-	/* This has the hack to return a default name for NullTVB. This */
-	/* hack can be removed when all dissectors use tvbuffs */
-	if ( tvb)
-		fi->ds_name = tvb_get_name(tvb);
-	else
-		fi->ds_name = tvb_get_name(pi.compat_top_tvb);
+	fi->ds_name = tvb_get_name(tvb);
 
 	return fi;
 }
diff --git a/epan/proto.h b/epan/proto.h
index 5153e0695e..9721ba1cc0 100644
--- a/epan/proto.h
+++ b/epan/proto.h
@@ -1,7 +1,7 @@
 /* proto.h
  * Definitions for protocol display
  *
- * $Id: proto.h,v 1.19 2001/10/31 07:47:26 guy Exp $
+ * $Id: proto.h,v 1.20 2001/11/15 10:58:51 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -118,9 +118,6 @@ typedef struct field_info {
 } field_info;
 
 
-/* For use while converting dissectors to use tvbuff's */
-#define NullTVB NULL
-
 /* Sets up memory used by proto routines. Called at program startup */
 extern void proto_init(const char *plugin_dir,
     void (register_all_protocols)(void), void (register_all_handoffs)(void));
diff --git a/epan/tvbuff.h b/epan/tvbuff.h
index 59a8eb099e..4c9f95284a 100644
--- a/epan/tvbuff.h
+++ b/epan/tvbuff.h
@@ -9,7 +9,7 @@
  * 		the data of a backing tvbuff, or can be a composite of
  * 		other tvbuffs.
  *
- * $Id: tvbuff.h,v 1.18 2001/11/13 23:55:37 gram Exp $
+ * $Id: tvbuff.h,v 1.19 2001/11/15 10:58:51 guy Exp $
  *
  * Copyright (c) 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
  *
@@ -384,10 +384,7 @@ extern gchar *tvb_get_name(tvbuff_t *tvb);
 /* Sets pd and offset so that tvbuff's can be used with code
  * that only understands pd/offset and not tvbuffs.
  * This is the "compatibility" function */
+/* XXX - we need to get rid of the last uses of this */
 void tvb_compat(tvbuff_t*, const guint8 **pd, int *offset);
 
-#define tvb_create_from_top(offset) \
-	tvb_new_subset(pi.compat_top_tvb, (offset), \
-				pi.captured_len - (offset), pi.len - (offset))
-
 #endif /* __TVBUFF_H__ */