There's no need to pass the result of tvb_get_ptr() as the 'value' in

proto_tree_add_*(): just use proto_tree_add_item().

Replace some tvb_get_ptr()s with tvb_get_ephemeral_string() or
tvb_get_const_stringz().

Use tvb_memeql() & tvb_memcmp().


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35558 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 11 insertions, 11 deletions

diff --git a/epan/dissectors/packet-msproxy.c b/epan/dissectors/packet-msproxy.c
index 5c4f4e1df1..bfbe8d2435 100644
--- a/epan/dissectors/packet-msproxy.c
+++ b/epan/dissectors/packet-msproxy.c
@@ -304,7 +304,7 @@ static int display_application_name(tvbuff_t *tvb, int offset,
 
 	length = tvb_strnlen( tvb, offset, 255);
 	proto_tree_add_text( tree, tvb, offset, length, "Application: %.*s",
-		length, tvb_get_ptr( tvb, offset, length));
+		length, tvb_get_ephemeral_string( tvb, offset, length));
 
 	return length;
 }
@@ -367,7 +367,7 @@ static void dissect_user_info_2(tvbuff_t *tvb, int offset,
 			return;
 		proto_tree_add_text( tree, tvb, offset, length + 1,
 			"User name: %.*s", length,
-			tvb_get_ptr( tvb, offset, length));
+			tvb_get_ephemeral_string( tvb, offset, length));
 		offset += length + 2;
 
 		length = tvb_strnlen( tvb, offset, 255);
@@ -375,7 +375,7 @@ static void dissect_user_info_2(tvbuff_t *tvb, int offset,
 			return;
 		proto_tree_add_text( tree, tvb, offset, length + 1,
 			"Application name: %.*s", length,
-			tvb_get_ptr( tvb, offset, length));
+			tvb_get_ephemeral_string( tvb, offset, length));
 		offset += length + 1;
 
 		length = tvb_strnlen( tvb, offset, 255);
@@ -383,7 +383,7 @@ static void dissect_user_info_2(tvbuff_t *tvb, int offset,
 			return;
 		proto_tree_add_text( tree, tvb, offset, length + 1,
 			"Client computer name: %.*s", length,
-			tvb_get_ptr( tvb, offset, length));
+			tvb_get_ephemeral_string( tvb, offset, length));
 	}
 }
 
@@ -448,7 +448,7 @@ static void dissect_auth(tvbuff_t *tvb, int offset,
 		offset += 134;
 
 		proto_tree_add_text( tree, tvb, offset, 7, "NTLMSSP signature: %.7s",
-			tvb_get_ptr( tvb, offset, 7));
+			tvb_get_ephemeral_string( tvb, offset, 7));
 		offset += 7;
 	}
 }
@@ -571,7 +571,7 @@ static void dissect_request_resolve(tvbuff_t *tvb, int offset,
 	if ( tree){
   	 	ti = proto_tree_add_text(tree, tvb, offset, length + 1,
    		 	"Host Name: %.*s", length,
-   		 	tvb_get_ptr( tvb, offset + 18, length));
+   		 	tvb_get_ephemeral_string( tvb, offset + 18, length));
 
 		name_tree = proto_item_add_subtree(ti, ett_msproxy_name);
 
@@ -582,7 +582,7 @@ static void dissect_request_resolve(tvbuff_t *tvb, int offset,
 		offset += 17;
 
 		proto_tree_add_text( name_tree, tvb, offset, length, "String: %s",
-   		 	tvb_get_ptr( tvb, offset, length));
+   		 	tvb_get_ephemeral_string( tvb, offset, length));
 	}
 }
 
@@ -672,7 +672,7 @@ static void dissect_msproxy_request(tvbuff_t *tvb,
 		offset += 8;
 
 		proto_tree_add_text( tree, tvb, offset, 4, "RWSP signature: %.4s",
-			tvb_get_ptr( tvb, offset, 4));
+			tvb_get_ephemeral_string( tvb, offset, 4));
 		offset += 12;
 	}
 	else 			/* no tree */
@@ -799,12 +799,12 @@ static void dissect_auth_1_ack(tvbuff_t *tvb, int offset,
 	offset += 134;
 	if ( tree) {
 		proto_tree_add_text( tree, tvb, offset, 7, "NTLMSSP signature: %.7s",
-			tvb_get_ptr( tvb, offset, 7));
+			tvb_get_ephemeral_string( tvb, offset, 7));
 		offset += 48;
 
 		/* XXX - always 255? */
 		proto_tree_add_text( tree, tvb, offset, 255, "NT domain: %.255s",
-			tvb_get_ptr( tvb, offset, 255));
+			tvb_get_ephemeral_string( tvb, offset, 255));
 	}
 }
 
@@ -993,7 +993,7 @@ static void dissect_msproxy_response(tvbuff_t *tvb, packet_info *pinfo,
 		offset += 8;
 
 		proto_tree_add_text( tree, tvb, offset, 4, "RWSP signature: %.4s",
-			tvb_get_ptr( tvb, offset, 4));
+			tvb_get_ephemeral_string( tvb, offset, 4));
 
 		offset += 12;
 	}