From 1d599defd74098d85254b03662d84f32b4c5fc5d Mon Sep 17 00:00:00 2001 From: morriss Date: Fri, 25 Jul 2008 15:06:52 +0000 Subject: [PATCH] Remove an unused variable and cast a string constant into a guchar. Also add newline at the end of the file. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25829 f5534014-38df-0310-8fa8-9805f1628bb7 --- epan/dissectors/packet-dcm.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c index 39dc471f04..46005f6c50 100644 --- a/epan/dissectors/packet-dcm.c +++ b/epan/dissectors/packet-dcm.c @@ -226,8 +226,6 @@ static gint static dissector_handle_t dcm_handle; -static gboolean dcm_desegment_headers = TRUE; - static const value_string dcm_pdu_ids[] = { { 1, "ASSOC Request" }, { 2, "ASSOC Accept" }, @@ -957,7 +955,7 @@ dcm_uid_or_desc(guchar *dcm_uid, guchar *dcm_desc) { /* Return Description, UID or error */ - return (dcm_desc == NULL ? (dcm_uid == NULL ? "Malformed Packet" : dcm_uid) : dcm_desc); + return (dcm_desc == NULL ? (dcm_uid == NULL ? (guchar *)"Malformed Packet" : dcm_uid) : dcm_desc); } static void @@ -3076,3 +3074,4 @@ From 3.7 Annex D Association Negotiation 7-n Server-response This field shall contain the Kerberos Server ticket, encoded in accordance with RFC-1510, if the User-Identity-Type value in the A-ASSOCIATE-RQ was 3. This field shall contain the SAML response if the User-Identity-Type value in the A-ASSOCIATE-RQ was 4. This field shall be zero length if the value of the User-Identity-Type in the A-ASSOCIATE-RQ was 1 or 2. */ + -- 2.34.1