Pass tvb and offset into print_nsap_net() and print_area() to "hide" the tvb_get_ptr call that dissectors are using.

Change-Id: Ibc5a51be462d431b85b34cac7a358d736ec7b9db
Reviewed-on: https://code.wireshark.org/review/7422
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/epan/osi-utils.c b/epan/osi-utils.c
index 48fe369f68..22be209b66 100644
--- a/epan/osi-utils.c
+++ b/epan/osi-utils.c
@@ -41,12 +41,12 @@
  * "dissect_nsap()" in epan/dissectors/packet-isup.c.
  */
 gchar *
-print_nsap_net( const guint8 *ad, int length )
+print_nsap_net( tvbuff_t *tvb, const gint offset, int length )
 {
   gchar *cur;
 
   cur = (gchar *)wmem_alloc(wmem_packet_scope(), MAX_NSAP_LEN * 3 + 50);
-  print_nsap_net_buf( ad, length, cur, MAX_NSAP_LEN * 3 + 50);
+  print_nsap_net_buf( tvb_get_ptr(tvb, offset, length), length, cur, MAX_NSAP_LEN * 3 + 50);
   return( cur );
 }
 
@@ -141,12 +141,12 @@ print_system_id_buf( const guint8 *ad, int length, gchar *buf, int buf_len)
 }
 
 gchar *
-print_area(const guint8 *ad, int length)
+print_area(tvbuff_t *tvb, const gint offset, int length)
 {
   gchar *cur;
 
   cur = (gchar *)wmem_alloc(wmem_packet_scope(), MAX_AREA_LEN * 3 + 20);
-  print_area_buf(ad, length, cur, MAX_AREA_LEN * 3 + 20);
+  print_area_buf(tvb_get_ptr(tvb, offset, length), length, cur, MAX_AREA_LEN * 3 + 20);
   return cur;
 }