Make "epan_init()" take, as additional arguments, pointers to routines

[obnox/wireshark/wip.git] / ptvcursor.c

diff --git a/ptvcursor.c b/ptvcursor.c
index 6159e6085cee894da50dec5d17749d04146e1f87..9c482a3959caec1909075341d38d8b3ec2f1a27b 100644 (file)
--- a/ptvcursor.c
+++ b/ptvcursor.c
@@ -1,24 +1,24 @@
 /* ptvcursor.c
- * 
+ *
  * Proto Tree TVBuff cursor
  * Gilbert Ramirez <gram@alumni.rice.edu>
  *
- * $Id: ptvcursor.c,v 1.4 2001/11/13 23:55:30 gram Exp $
+ * $Id: ptvcursor.c,v 1.7 2002/08/28 21:00:41 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
  * Copyright 2000 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * 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.
@@ -56,16 +56,61 @@ ptvcursor_add(ptvcursor_t *ptvc, int hf, gint length, gboolean endianness)
 {
        proto_item      *item;
 
+       item = ptvcursor_add_no_advance(ptvc, hf, length, endianness);
+       ptvc->offset += proto_item_get_len(item);
+       return item;
+}
+
+/* Gets data from tvbuff, adds it to proto_tree, *DOES NOT* increment
+ * offset, and returns proto_item* */
+proto_item*
+ptvcursor_add_no_advance(ptvcursor_t* ptvc, int hf, gint length,
+               gboolean endianness)
+{
+       proto_item      *item;
+
        item = proto_tree_add_item(ptvc->tree, hf, ptvc->tvb, ptvc->offset,
                        length, endianness);
 
-       ptvc->offset += proto_item_get_len(item);
        return item;
 }
 
+/* Advance the ptvcursor's offset within its tvbuff without
+ * adding anything to the proto_tree. */
+void
+ptvcursor_advance(ptvcursor_t* ptvc, gint length)
+{
+       ptvc->offset += length;
+}
+
 /* Frees memory for ptvcursor_t, but nothing deeper than that. */
 void
 ptvcursor_free(ptvcursor_t *ptvc)
 {
        g_free(ptvc);
 }
+/* Returns tvbuff. */
+tvbuff_t*
+ptvcursor_tvbuff(ptvcursor_t* ptvc)
+{
+       return ptvc->tvb;
+}
+
+/* Returns current offset. */
+gint
+ptvcursor_current_offset(ptvcursor_t* ptvc)
+{
+       return ptvc->offset;
+}
+
+proto_tree*
+ptvcursor_tree(ptvcursor_t* ptvc)
+{
+       return ptvc->tree;
+}
+
+void
+ptvcursor_set_tree(ptvcursor_t* ptvc, proto_tree *tree)
+{
+       ptvc->tree = tree;
+}