From 4f81f615b099da56cc7c5595bbd05d8eea0a2510 Mon Sep 17 00:00:00 2001
From: Guy Harris <guy@alum.mit.edu>
Date: Mon, 17 Jan 2005 23:26:45 +0000
Subject: [PATCH] Use -1 rather than tvb_length() to create a protocol tree
 item that runs to the end of the tvbuff.

Don't return a value from "dissect_h4501()" - the value isn't used, and
"dissect_h4501()" is registered with "register_dissector()", so it's not
supposed to return a value.

svn path=/trunk/; revision=13104
---
 asn1/h450/packet-h450-template.c | 10 ++--------
 epan/dissectors/packet-h450.c    | 12 +++---------
 epan/dissectors/packet-h450.h    |  2 +-
 3 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/asn1/h450/packet-h450-template.c b/asn1/h450/packet-h450-template.c
index 616c9a7b71..bffeecb308 100644
--- a/asn1/h450/packet-h450-template.c
+++ b/asn1/h450/packet-h450-template.c
@@ -770,19 +770,17 @@ dissect_ros_ROSxxx(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr
 	return offset;
 
 }
-static int
+static void
 dissect_h4501(tvbuff_t *tvb, packet_info *pinfo, proto_tree* tree)
 {
    proto_item *it;
    proto_tree *tr;
    guint32 offset=0;
 
-   it=proto_tree_add_protocol_format(tree, proto_h4501, tvb, 0, tvb_length(tvb), "H.450.1");
+   it=proto_tree_add_protocol_format(tree, proto_h4501, tvb, 0, -1, "H.450.1");
    tr=proto_item_add_subtree(it, ett_h4501);
 
    dissect_h450_H4501SupplementaryService(tvb, offset, pinfo, tr, hf_h4501);
-   return offset;
-
 }
 
 /*--- proto_register_h450 -------------------------------------------*/
@@ -971,7 +969,3 @@ proto_reg_handoff_h4501(void)
 	h4501_handle = find_dissector("h4501");
 
 }
-
-
-
-
diff --git a/epan/dissectors/packet-h450.c b/epan/dissectors/packet-h450.c
index 68549043ad..00d2c9399c 100644
--- a/epan/dissectors/packet-h450.c
+++ b/epan/dissectors/packet-h450.c
@@ -1,6 +1,6 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-h450.c                                                            */
+/* ./packet-h450.c                                                            */
 /* ../../tools/asn2eth.py -X -e -p h450 -c h450.cnf -s packet-h450-template h4501.asn */
 
 /* Input file: packet-h450-template.c */
@@ -2447,19 +2447,17 @@ dissect_ros_ROSxxx(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr
 	return offset;
 
 }
-static int
+static void
 dissect_h4501(tvbuff_t *tvb, packet_info *pinfo, proto_tree* tree)
 {
    proto_item *it;
    proto_tree *tr;
    guint32 offset=0;
 
-   it=proto_tree_add_protocol_format(tree, proto_h4501, tvb, 0, tvb_length(tvb), "H.450.1");
+   it=proto_tree_add_protocol_format(tree, proto_h4501, tvb, 0, -1, "H.450.1");
    tr=proto_item_add_subtree(it, ett_h4501);
 
    dissect_h450_H4501SupplementaryService(tvb, offset, pinfo, tr, hf_h4501);
-   return offset;
-
 }
 
 /*--- proto_register_h450 -------------------------------------------*/
@@ -3035,7 +3033,3 @@ proto_reg_handoff_h4501(void)
 	h4501_handle = find_dissector("h4501");
 
 }
-
-
-
-
diff --git a/epan/dissectors/packet-h450.h b/epan/dissectors/packet-h450.h
index 8f2f90d1c4..b8c32c18b8 100644
--- a/epan/dissectors/packet-h450.h
+++ b/epan/dissectors/packet-h450.h
@@ -1,6 +1,6 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-h450.h                                                            */
+/* ./packet-h450.h                                                            */
 /* ../../tools/asn2eth.py -X -e -p h450 -c h450.cnf -s packet-h450-template h4501.asn */
 
 /* Input file: packet-h450-template.h */