Apply The Written Word's patch from bug 333, which changes HAVE_ICONV_H

to HAVE_ICONV.

svn path=/trunk/; revision=18758

1 files changed, 296 insertions, 296 deletions

diff --git a/epan/dissectors/packet-bacapp.h b/epan/dissectors/packet-bacapp.h
index 2a37e449c6..ee9c836cde 100644
--- a/epan/dissectors/packet-bacapp.h
+++ b/epan/dissectors/packet-bacapp.h
@@ -30,7 +30,7 @@
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
-#if HAVE_ICONV_H
+#if HAVE_ICONV
 #include <iconv.h>
 #endif
 #endif
@@ -116,7 +116,7 @@ dissect_bacapp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
  * }
  * @param tvb
  * @param pinfo
- * @param tree 
+ * @param tree
  * @param offset
  * @return modified offset
  */
@@ -125,7 +125,7 @@ fConfirmedRequestPDU(tvbuff_t *tvb, proto_tree *tree, guint offset);
 
 /**
  * @param tvb
- * @param tree 
+ * @param tree
  * @param offset
  * @param ack - indocates whether working on request or ack
  * @param svc - output variable to return service choice
@@ -144,7 +144,7 @@ fStartConfirmed(tvbuff_t *tvb, proto_tree *tree, guint offset, guint8 ack,
  *  service-request	[3] BACnetUnconfirmedServiceRequest -- Context-specific tags 0..3 are NOT used in header encoding
  * }
  * @param tvb
- * @param tree 
+ * @param tree
  * @param offset
  * @return modified offset
  */
@@ -159,7 +159,7 @@ fUnconfirmedRequestPDU(tvbuff_t *tvb, proto_tree *tree, guint offset);
  *  service-ACK-choice	[3] BACnetUnconfirmedServiceChoice -- Context-specific tags 0..3 are NOT used in header encoding
  * }
  * @param tvb
- * @param tree 
+ * @param tree
  * @param offset
  * @return modified offset
  */
@@ -179,7 +179,7 @@ fSimpleAckPDU(tvbuff_t *tvb, proto_tree *tree, guint offset);
  *  service-ACK				[8] BACnet-Confirmed-Service-Request  -- Context-specific tags 0..8 are NOT used in header encoding
  * }
  * @param tvb
- * @param tree 
+ * @param tree
  * @param offset
  * @return modified offset
  */
@@ -197,7 +197,7 @@ fComplexAckPDU(tvbuff_t *tvb, proto_tree *tree, guint offset);
  *  actual-window-size		[6] Unsigned (0..127)
  * }
  * @param tvb
- * @param tree 
+ * @param tree
  * @param offset
  * @return modified offset
  */
@@ -213,7 +213,7 @@ fSegmentAckPDU(tvbuff_t *tvb, proto_tree *tree, guint offset);
  *  error					[4] BACnet-Error
  * }
  * @param tvb
- * @param tree 
+ * @param tree
  * @param offset
  * @return modified offset
  */
@@ -228,7 +228,7 @@ fErrorPDU(tvbuff_t *tvb, proto_tree *tree, guint offset);
  *  reject-reason			[3] BACnetRejectReason
  * }
  * @param tvb
- * @param tree 
+ * @param tree
  * @param offset
  * @return modified offset
  */
@@ -244,7 +244,7 @@ fRejectPDU(tvbuff_t *tvb, proto_tree *tree, guint offset);
  *  abort-reason			[4] BACnetAbortReason
  * }
  * @param tvb
- * @param tree 
+ * @param tree
  * @param offset
  * @return modified offset
  */
@@ -253,10 +253,10 @@ fAbortPDU(tvbuff_t *tvb, proto_tree *tree, guint offset);
 
 /**
  * 20.2.4, adds the label with max 64Bit unsigned Integer Value to tree
- * @param tvb 
- * @param tree 
- * @param offset 
- * @param label 
+ * @param tvb
+ * @param tree
+ * @param offset
+ * @param label
  * @return modified offset
  */
 static guint
@@ -264,10 +264,10 @@ fUnsignedTag (tvbuff_t *tvb, proto_tree *tree, guint offset, const gchar *label)
 
 /**
  * 20.2.5, adds the label with max 64Bit signed Integer Value to tree
- * @param tvb 
- * @param tree 
- * @param offset 
- * @param label 
+ * @param tvb
+ * @param tree
+ * @param offset
+ * @param label
  * @return modified offset
  */
 static guint
@@ -275,10 +275,10 @@ fSignedTag (tvbuff_t *tvb, proto_tree *tree, guint offset, const gchar *label);
 
 /**
  * 20.2.8, adds the label with Octet String to tree; if lvt == 0 then lvt = restOfFrame
- * @param tvb 
- * @param tree 
- * @param offset 
- * @param label 
+ * @param tvb
+ * @param tree
+ * @param offset
+ * @param label
  * @param lvt length of String
  * @return modified offset
  */
@@ -287,10 +287,10 @@ fOctetString (tvbuff_t *tvb, proto_tree *tree, guint offset, const gchar *label,
 
 /**
  * 20.2.12, adds the label with Date Value to tree
- * @param tvb 
- * @param tree 
- * @param offset 
- * @param label 
+ * @param tvb
+ * @param tree
+ * @param offset
+ * @param label
  * @return modified offset
  */
 static guint
@@ -298,10 +298,10 @@ fDate    (tvbuff_t *tvb, proto_tree *tree, guint offset, const gchar *label);
 
 /**
  * 20.2.13, adds the label with Time Value to tree
- * @param tvb 
- * @param tree 
- * @param offset 
- * @param label 
+ * @param tvb
+ * @param tree
+ * @param offset
+ * @param label
  * @return modified offset
  */
 static guint
@@ -310,9 +310,9 @@ fTime (tvbuff_t *tvb, proto_tree *tree, guint offset, const gchar *label);
 /**
  * 20.2.14, adds Object Identifier to tree
  * use BIG ENDIAN: Bits 31..22 Object Type, Bits 21..0 Instance Number
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -351,9 +351,9 @@ fConfirmedServiceAck (tvbuff_t *tvb, proto_tree *tree, guint offset, gint servic
  * 	acknowledgementSource	[4] Character String,
  *  timeOfAcknowledgement	[5] BACnetTimeStamp
  * }
- * @param tvb 
+ * @param tvb
  * @param tree
- * @param offset 
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -367,9 +367,9 @@ fAcknowledgeAlarmRequest (tvbuff_t *tvb, proto_tree *tree, guint offset);
  * 	timeRemaining	[3] unsigned,
  * 	listOfValues	[4] SEQUENCE OF BACnetPropertyValues
  * }
- * @param tvb 
+ * @param tvb
  * @param tree
- * @param offset 
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -391,9 +391,9 @@ fConfirmedCOVNotificationRequest (tvbuff_t *tvb, proto_tree *tree, guint offset)
  * 	toState	[11] BACnetEventState,
  * 	eventValues	[12] BACnetNotificationParameters OPTIONAL
  * }
- * @param tvb 
+ * @param tvb
  * @param tree
- * @param offset 
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -405,9 +405,9 @@ fConfirmedEventNotificationRequest (tvbuff_t *tvb, proto_tree *tree, guint offse
  * 	alarmState	BACnetEventState,
  * 	acknowledgedTransitions	 BACnetEventTransitionBits
  * }
- * @param tvb 
+ * @param tvb
  * @param tree
- * @param offset 
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -435,9 +435,9 @@ fGetAlarmSummaryAck (tvbuff_t *tvb, proto_tree *tree, guint offset);
  *      } OPTIONAL,
  *  notificationClassFilter	[5] Unsigned OPTIONAL
  * }
- * @param tvb 
+ * @param tvb
  * @param tree
- * @param offset 
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -451,9 +451,9 @@ fGetEnrollmentSummaryRequest (tvbuff_t *tvb, proto_tree *tree, guint offset);
  * 	priority    Unsigned8,
  *  notificationClass   Unsigned OPTIONAL
  * }
- * @param tvb 
+ * @param tvb
  * @param tree
- * @param offset 
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -463,9 +463,9 @@ fGetEnrollmentSummaryAck (tvbuff_t *tvb, proto_tree *tree, guint offset);
  * GetEventInformation-Request ::= SEQUENCE {
  * 	lastReceivedObjectIdentifier	[0] BACnetObjectIdentifer
  * }
- * @param tvb 
+ * @param tvb
  * @param tree
- * @param offset 
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -476,9 +476,9 @@ fGetEventInformationRequest (tvbuff_t *tvb, proto_tree *tree, guint offset);
  * 	listOfEventSummaries	[0] listOfEventSummaries,
  *  moreEvents  [1] BOOLEAN
  * }
- * @param tvb 
+ * @param tvb
  * @param tree
- * @param offset 
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -491,9 +491,9 @@ fGetEventInformationACK (tvbuff_t *tvb, proto_tree *tree, guint offset);
  * 	request	[2] BACnetLifeSafetyOperation
  * 	objectIdentifier	[3] BACnetObjectIdentifier OPTIONAL
  * }
- * @param tvb 
+ * @param tvb
  * @param tree
- * @param offset 
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -506,10 +506,10 @@ fLifeSafetyOperationRequest(tvbuff_t *tvb, proto_tree *tree, guint offset, const
  * 	issueConfirmedNotifications	[2] BOOLEAN OPTIONAL
  * 	lifetime	[3] Unsigned OPTIONAL
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
- * @param label 
+ * @param tvb
+ * @param tree
+ * @param offset
+ * @param label
  * @param src
  * @return modified offset
  */
@@ -525,9 +525,9 @@ fSubscribeCOVRequest(tvbuff_t *tvb, proto_tree *tree, guint offset);
  * 	monitoredPropertyIdentifier	[4] BACnetPropertyReference OPTIONAL
  * 	covIncrement	[5] Unsigned OPTIONAL
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -547,9 +547,9 @@ fSubscribeCOVPropertyRequest(tvbuff_t *tvb, proto_tree *tree, guint offset);
  * 			}
  * 		}
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -570,9 +570,9 @@ fAtomicReadFileRequest(tvbuff_t *tvb, proto_tree *tree, guint offset);
  * 			}
  * 		}
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -593,9 +593,9 @@ fAtomicReadFileAck (tvbuff_t *tvb, proto_tree *tree, guint offset);
  * 			}
  * 		}
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -606,9 +606,9 @@ fAtomicWriteFileRequest(tvbuff_t *tvb, proto_tree *tree, guint offset);
  * 		fileStartPosition	[0] INTEGER,
  * 	   	fileStartRecord	[1] INTEGER,
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -621,9 +621,9 @@ fAtomicWriteFileAck (tvbuff_t *tvb, proto_tree *tree, guint offset);
  *  propertyArrayIndex  [2] Unsigned OPTIONAL, -- used only with array datatype
  *  listOfElements  [3] ABSTRACT-SYNTAX.&Type
  * }
- * @param tvb 
+ * @param tvb
  * @param tree
- * @param offset 
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -634,9 +634,9 @@ fAddListElementRequest(tvbuff_t *tvb, proto_tree *tree, guint offset);
  * 	objectSpecifier	[0] ObjectSpecifier,
  *  listOfInitialValues	[1] SEQUENCE OF BACnetPropertyValue OPTIONAL
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -644,9 +644,9 @@ fCreateObjectRequest(tvbuff_t *tvb, proto_tree *subtree, guint offset);
 
 /**
  * CreateObject-Request ::= BACnetObjectIdentifier
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -656,9 +656,9 @@ fCreateObjectAck (tvbuff_t *tvb, proto_tree *tree, guint offset);
  * DeleteObject-Request ::= SEQUENCE {
  * 	ObjectIdentifier	BACnetObjectIdentifer
  * }
- * @param tvb 
+ * @param tvb
  * @param tree
- * @param offset 
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -670,9 +670,9 @@ fDeleteObjectRequest(tvbuff_t *tvb, proto_tree *tree, guint offset);
  * 	propertyIdentifier	[1] BACnetPropertyIdentifier,
  * 	propertyArrayIndex	[2] Unsigned OPTIONAL, -- used only with array datatype
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -685,9 +685,9 @@ fReadPropertyRequest(tvbuff_t *tvb, proto_tree *tree, guint offset);
  * 	propertyArrayIndex	[2] Unsigned OPTIONAL, -- used only with array datatype
  * 	propertyValue	[3] ABSTRACT-SYNTAX.&Type
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -698,9 +698,9 @@ fReadPropertyAck (tvbuff_t *tvb, proto_tree *tree, guint offset);
  * 	objectSelectionCriteria	[0] objectSelectionCriteria,
  * 	listOfPropertyReferences	[1] SEQUENCE OF BACnetPropertyReference OPTIONAL
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -710,9 +710,9 @@ fReadPropertyConditionalRequest(tvbuff_t *tvb, proto_tree *subtree, guint offset
  * ReadPropertyConditional-ACK ::= SEQUENCE {
  * 	listOfPReadAccessResults	SEQUENCE OF ReadAccessResult OPTIONAL
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -762,9 +762,9 @@ fReadPropertyMultipleAck (tvbuff_t *tvb, proto_tree *tree, guint offset);
  * 			},
  * 		} OPTIONAL
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -779,9 +779,9 @@ fReadRangeRequest (tvbuff_t *tvb, proto_tree *tree, guint offset);
  *  itemCount	[4] Unsigned,
  *  itemData	[5] SEQUENCE OF ABSTRACT-SYNTAX.&Type
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -794,9 +794,9 @@ fReadRangeAck (tvbuff_t *tvb, proto_tree *tree, guint offset);
  * 	propertyArrayIndex	[2] Unsigned OPTIONAL, -- used only with array datatype
  * 	listOfElements	[3] ABSTRACT-SYNTAX.&Type
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -810,9 +810,9 @@ fRemoveListElementRequest(tvbuff_t *tvb, proto_tree *tree, guint offset);
  * 	propertyValue	[3] ABSTRACT-SYNTAX.&Type
  *  priority	[4] Unsigned8 (1..16) OPTIONAL --used only when property is commandable
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -822,9 +822,9 @@ fWritePropertyRequest(tvbuff_t *tvb, proto_tree *tree, guint offset);
  * WritePropertyMultiple-Request ::= SEQUENCE {
  * 	listOfWriteAccessSpecifications	SEQUENCE OF WriteAccessSpecification
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -839,9 +839,9 @@ fWritePropertyMultipleRequest(tvbuff_t *tvb, proto_tree *tree, guint offset);
  * 		},
  *  password	[2] CharacterString (SIZE(1..20)) OPTIONAL
  * }
- * @param tvb 
+ * @param tvb
  * @param tree
- * @param offset 
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -853,9 +853,9 @@ fDeviceCommunicationControlRequest(tvbuff_t *tvb, proto_tree *tree, guint offset
  * 	serviceNumber	[1] Unsigned,
  * 	serviceParameters	[2] ABSTRACT-SYNTAX.&Type OPTIONAL
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -867,9 +867,9 @@ fConfirmedPrivateTransferRequest(tvbuff_t *tvb, proto_tree *tree, guint offset);
  * 	serviceNumber	[1] Unsigned,
  * 	resultBlock	[2] ABSTRACT-SYNTAX.&Type OPTIONAL
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -888,9 +888,9 @@ fConfirmedPrivateTransferAck(tvbuff_t *tvb, proto_tree *tree, guint offset);
  *      },
  *  message [3] CharacterString
  * }
- * @param tvb 
+ * @param tvb
  * @param tree
- * @param offset 
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -909,9 +909,9 @@ fConfirmedTextMessageRequest(tvbuff_t *tvb, proto_tree *tree, guint offset);
  * 		},
  *  password	[1] CharacterString (SIZE(1..20)) OPTIONAL
  * }
- * @param tvb 
+ * @param tvb
  * @param tree
- * @param offset 
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -922,9 +922,9 @@ fReinitializeDeviceRequest(tvbuff_t *tvb, proto_tree *tree, guint offset);
  *  vtClass	BACnetVTClass,
  *  localVTSessionIdentifier	Unsigned8
  * }
- * @param tvb 
+ * @param tvb
  * @param tree
- * @param offset 
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -934,9 +934,9 @@ fVtOpenRequest(tvbuff_t *tvb, proto_tree *tree, guint offset);
  * VTOpen-ACK ::= SEQUENCE {
  *  remoteVTSessionIdentifier	Unsigned8
  * }
- * @param tvb 
+ * @param tvb
  * @param tree
- * @param offset 
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -946,9 +946,9 @@ fVtOpenAck (tvbuff_t *tvb, proto_tree *tree, guint offset);
  * VTClose-Request ::= SEQUENCE {
  *  listOfRemoteVTSessionIdentifiers	SEQUENCE OF Unsigned8
  * }
- * @param tvb 
+ * @param tvb
  * @param tree
- * @param offset 
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -960,9 +960,9 @@ fVtCloseRequest (tvbuff_t *tvb, proto_tree *tree, guint offset);
  *  vtNewData	OCTET STRING,
  *  vtDataFlag	Unsigned (0..1)
  * }
- * @param tvb 
+ * @param tvb
  * @param tree
- * @param offset 
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -973,9 +973,9 @@ fVtDataRequest (tvbuff_t *tvb, proto_tree *tree, guint offset);
  *  allNewDataAccepted	[0] BOOLEAN,
  *  acceptedOctetCount	[1] Unsigned OPTIONAL -- present only if allNewDataAccepted = FALSE
  * }
- * @param tvb 
+ * @param tvb
  * @param tree
- * @param offset 
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -989,9 +989,9 @@ fVtDataAck (tvbuff_t *tvb, proto_tree *tree, guint offset);
  *  operatorPassword	[3] CharacterString (SIZE(1..20)) OPTIONAL,
  *  startEncypheredSession	[4] BOOLEAN OPTIONAL
  * }
- * @param tvb 
+ * @param tvb
  * @param tree
- * @param offset 
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1001,9 +1001,9 @@ fAuthenticateRequest (tvbuff_t *tvb, proto_tree *tree, guint offset);
  * Authenticate-ACK ::= SEQUENCE {
  *  modifiedRandomNumber	Unsigned32,
  * }
- * @param tvb 
+ * @param tvb
  * @param tree
- * @param offset 
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1016,9 +1016,9 @@ fAuthenticateAck (tvbuff_t *tvb, proto_tree *tree, guint offset);
  *  remoteDeviceIdentifier	BACnetObjectIdentifier,
  *  remoteDeviceAddress	BACnetAddress
  * }
- * @param tvb 
+ * @param tvb
  * @param tree
- * @param offset 
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1027,8 +1027,8 @@ fRequestKeyRequest (tvbuff_t *tvb, proto_tree *tree, guint offset);
 /**
  * Unconfirmed-Service-Request ::= CHOICE {
  * }
- * @param tvb 
- * @param tree 
+ * @param tvb
+ * @param tree
  * @param offset
  * @param service_choice
  * @return modified offset
@@ -1044,9 +1044,9 @@ fUnconfirmedServiceRequest (tvbuff_t *tvb, proto_tree *tree, guint offset, gint
  * 	timeRemaining	[3] unsigned,
  * 	listOfValues	[4] SEQUENCE OF BACnetPropertyValues
  * }
- * @param tvb 
+ * @param tvb
  * @param tree
- * @param offset 
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1068,9 +1068,9 @@ fUnconfirmedCOVNotificationRequest (tvbuff_t *tvb, proto_tree *tree, guint offse
  * 	toState	[11] BACnetEventState,
  * 	eventValues	[12] BACnetNotificationParameters OPTIONAL
  * }
- * @param tvb 
+ * @param tvb
  * @param tree
- * @param offset 
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1083,9 +1083,9 @@ fUnconfirmedEventNotificationRequest (tvbuff_t *tvb, proto_tree *tree, guint off
  * 	segmentationSupported	BACnetSegmentation,
  * 	vendorID	Unsigned
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1098,9 +1098,9 @@ fIAmRequest  (tvbuff_t *tvb, proto_tree *tree, guint offset);
  *  objectIdentifier	BACnetObjectIdentifier,
  * 	objectName	CharacterString
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1112,9 +1112,9 @@ fIHaveRequest  (tvbuff_t *tvb, proto_tree *tree, guint offset);
  * 	serviceNumber	[1] Unsigned,
  * 	serviceParameters	[2] ABSTRACT-SYNTAX.&Type OPTIONAL
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1133,9 +1133,9 @@ fUnconfirmedPrivateTransferRequest(tvbuff_t *tvb, proto_tree *tree, guint offset
  *      },
  *  message [3] CharacterString
  * }
- * @param tvb 
+ * @param tvb
  * @param tree
- * @param offset 
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1145,9 +1145,9 @@ fUnconfirmedTextMessageRequest(tvbuff_t *tvb, proto_tree *tree, guint offset);
  * TimeSynchronization-Request ::=  SEQUENCE {
  *  BACnetDateTime
  * }
- * @param tvb 
+ * @param tvb
  * @param tree
- * @param offset 
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1157,9 +1157,9 @@ fTimeSynchronizationRequest  (tvbuff_t *tvb, proto_tree *tree, guint offset);
  * UTCTimeSynchronization-Request ::=  SEQUENCE {
  *  BACnetDateTime
  * }
- * @param tvb 
+ * @param tvb
  * @param tree
- * @param offset 
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1176,9 +1176,9 @@ fUTCTimeSynchronizationRequest  (tvbuff_t *tvb, proto_tree *tree, guint offset);
  *      objectName [3] CharacterString
  *      }
  * }
- * @param tvb 
+ * @param tvb
  * @param tree
- * @param offset 
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1189,9 +1189,9 @@ fWhoHas (tvbuff_t *tvb, proto_tree *tree, guint offset);
  * 	deviceInstanceRangeLowLimit	[0] Unsigned (0..4194303) OPTIONAL, -- must be used as a pair, see 16.9,
  * 	deviceInstanceRangeHighLimit	[0] Unsigned (0..4194303) OPTIONAL, -- must be used as a pair, see 16.9,
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1208,7 +1208,7 @@ fWhoIsRequest  (tvbuff_t *tvb, proto_tree *tree, guint offset);
  *                      [default] Error
  * }
  * @param tvb
- * @param tree 
+ * @param tree
  * @param offset
  * @param service
  * @return modified offset
@@ -1220,7 +1220,7 @@ fBACnetError(tvbuff_t *tvb, proto_tree *tree, guint offset, guint service);
  * Dissect a BACnetError in a context tag
  *
  * @param tvb
- * @param tree 
+ * @param tree
  * @param offset
  * @return modified offset
  */
@@ -1233,7 +1233,7 @@ static guint fContextTaggedError(tvbuff_t *tvb, proto_tree *tree, guint offset);
  *    }
  * }
  * @param tvb
- * @param tree 
+ * @param tree
  * @param offset
  * @return modified offset
  */
@@ -1247,7 +1247,7 @@ fChangeListError(tvbuff_t *tvb, proto_tree *tree, guint offset);
  *    }
  * }
  * @param tvb
- * @param tree 
+ * @param tree
  * @param offset
  * @return modified offset
  */
@@ -1263,7 +1263,7 @@ fCreateObjectError(tvbuff_t *tvb, proto_tree *tree, guint offset);
  *    }
  * }
  * @param tvb
- * @param tree 
+ * @param tree
  * @param offset
  * @return modified offset
  */
@@ -1277,7 +1277,7 @@ fConfirmedPrivateTransferError(tvbuff_t *tvb, proto_tree *tree, guint offset);
  *    }
  * }
  * @param tvb
- * @param tree 
+ * @param tree
  * @param offset
  * @return modified offset
  */
@@ -1291,7 +1291,7 @@ fWritePropertyMultipleError(tvbuff_t *tvb, proto_tree *tree, guint offset);
  *    }
  * }
  * @param tvb
- * @param tree 
+ * @param tree
  * @param offset
  * @return modified offset
  */
@@ -1300,10 +1300,10 @@ fVTCloseError(tvbuff_t *tvb, proto_tree *tree, guint offset);
 
 /**
  * BACnet Application Types chapter 20.2.1
- * @param tvb 
- * @param tree 
- * @param offset 
- * @param label 
+ * @param tvb
+ * @param tree
+ * @param offset
+ * @param label
  * @return modified offset
  */
 static guint
@@ -1321,9 +1321,9 @@ fApplicationTypes   (tvbuff_t *tvb, proto_tree *tree, guint offset, const gchar
  *  quitOnFailure       [7] BOOLEAN,
  *  writeSuccessful     [8] BOOLEAN
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1333,9 +1333,9 @@ fActionCommand (tvbuff_t *tvb, proto_tree *tree, guint offset);
  * BACnetActionList ::= SEQUENCE {
  *  action  [0] SEQUENCE of BACnetActionCommand
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1345,9 +1345,9 @@ fActionList (tvbuff_t *tvb, proto_tree *tree, guint offset);
  *  network-number  Unsigned16, -- A value 0 indicates the local network
  *  mac-address     OCTET STRING -- A string of length 0 indicates a broadcast
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1358,9 +1358,9 @@ fAddress (tvbuff_t *tvb, proto_tree *tree, guint offset);
  * 	deviceObjectID  BACnetObjectIdentifier
  * 	deviceAddress   BacnetAddress
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1372,9 +1372,9 @@ fAddressBinding (tvbuff_t *tvb, proto_tree *tree, guint offset);
  * 	dateRange   [1] BACnetDateRange,
  *  weekNDay    [2] BacnetWeekNday
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1386,9 +1386,9 @@ fCalendaryEntry (tvbuff_t *tvb, proto_tree *tree, guint offset);
  * 	real-increment  REAL,
  * 	default-increment   NULL
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1399,9 +1399,9 @@ fClientCOV (tvbuff_t *tvb, proto_tree *tree, guint offset);
  * BACnetDailySchedule ::= SEQUENCE {
  *  day-schedule    [0] SENQUENCE OF BACnetTimeValue
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1411,9 +1411,9 @@ fDailySchedule (tvbuff_t *tvb, proto_tree *tree, guint offset);
  * BACnetWeeklySchedule ::= SEQUENCE {
  *  week-schedule    SENQUENCE SIZE (7) OF BACnetDailySchedule
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1424,9 +1424,9 @@ fWeeklySchedule (tvbuff_t *tvb, proto_tree *tree, guint offset);
  *  StartDate   Date,
  *  EndDate     Date
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1437,10 +1437,10 @@ fDateRange (tvbuff_t *tvb, proto_tree *tree, guint offset);
  *  date   Date,
  *  time   Time
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
- * @param label 
+ * @param tvb
+ * @param tree
+ * @param offset
+ * @param label
  * @return modified offset
  */
 static guint
@@ -1457,9 +1457,9 @@ fDateTime (tvbuff_t *tvb, proto_tree *tree, guint offset, const gchar *label);
  *  issueConfirmedNotifications BOOLEAN,
  *  transitions BACnetEventTransitionBits
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1474,9 +1474,9 @@ fDestination (tvbuff_t *tvb, proto_tree *tree, guint offset);
  *  propertyArrayIndex  [2] Unsigend OPTIONAL,
  *  deviceIdentifier    [3] BACnetObjectIdentifier OPTIONAL
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1489,9 +1489,9 @@ fDeviceObjectPropertyReference (tvbuff_t *tvb, proto_tree *tree, guint offset);
  *  deviceIdentifier    [0] BACnetObjectIdentifier OPTIONAL,
  *  objectIdentifier    [1] BACnetObjectIdentifier
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1545,9 +1545,9 @@ fDeviceObjectReference (tvbuff_t *tvb, proto_tree *tree, guint offset);
  *		mode-property-reference [3] BACnetDeviceObjectPropertyReference
  *		}
  *	}
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1574,9 +1574,9 @@ fEventParameter (tvbuff_t *tvb, proto_tree *tree, guint offset);
  *		}
  *	statusFlags [2] BACnetStatusFlags OPTIONAL
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1631,9 +1631,9 @@ fLogRecord (tvbuff_t *tvb, proto_tree *tree, guint offset);
  *      operation-expected   [3] BACnetLifeSafetyOperation
  *      }
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1645,9 +1645,9 @@ fNotificationParameters (tvbuff_t *tvb, proto_tree *tree, guint offset);
  * 	propertyIdentifier	[1] BACnetPropertyIdentifier,
  * 	propertyArrayIndex	[2] Unsigned OPTIONAL, -- used only with array datatype
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1663,9 +1663,9 @@ fBACnetObjectPropertyReference (tvbuff_t *tvb, proto_tree *tree, guint offset);
  *		value [3] ABSTRACT-SYNTAX.&Type, --any datatype appropriate for the specified property
  *		priority [4] Unsigned (1..16) OPTIONAL
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1674,9 +1674,9 @@ fObjectPropertyValue (tvbuff_t *tvb, proto_tree *tree, guint offset);
 
 /**
  * BACnetPriorityArray ::= SEQUENCE SIZE (16) OF BACnetPriorityValue
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1690,9 +1690,9 @@ fPropertyReference (tvbuff_t *tvb, proto_tree *tree, guint offset, guint8 tagoff
  * 	propertyIdentifier	[0] BACnetPropertyIdentifier,
  * 	propertyArrayIndex	[1] Unsigned OPTIONAL, -- used only with array datatype
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1709,9 +1709,9 @@ fBACnetObjectPropertyReference (tvbuff_t *tvb, proto_tree *tree, guint offset);
  * 		value [2] ABSTRACT-SYNTAX.&Type, -- any datatype appropriate for the specified property
  * 		priority [3] Unsigned (1..16) OPTIONAL -- used only when property is commandable
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1726,9 +1726,9 @@ fPropertyValue (tvbuff_t *tvb, proto_tree *tree, guint offset, guint8 tagoffset)
  * 	device	[0] BACnetObjectIdentifier
  * 	address	[1] BACnetAddress
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1740,9 +1740,9 @@ fRecipient (tvbuff_t *tvb, proto_tree *tree, guint offset);
  * 	recipient	[0] BACnetRecipient
  * 	processID	[1] Unsigned32
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1754,11 +1754,11 @@ fRecipientProcess (tvbuff_t *tvb, proto_tree *tree, guint offset);
  * 	sessionKey	OCTET STRING (SIZE(8)), -- 56 bits for key, 8 bits for checksum
  * 	peerAddress	BACnetAddress
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
- * @todo check if checksum is displayed correctly 
+ * @todo check if checksum is displayed correctly
  */
 static guint
 fSessionKey (tvbuff_t *tvb, proto_tree *tree, guint offset);
@@ -1769,9 +1769,9 @@ fSessionKey (tvbuff_t *tvb, proto_tree *tree, guint offset);
  * BACnetSetpointReference ::= SEQUENCE {
  * 	sessionKey	[0] BACnetObjectPropertyReference OPTIONAL
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1787,9 +1787,9 @@ fSetpointReference (tvbuff_t *tvb, proto_tree *tree, guint offset);
  * 		listOfTimeValues	[2] SEQUENCE OF BACnetTimeValue,
  * 		eventPriority		[3] Unsigned (1..16)
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1801,9 +1801,9 @@ fSpecialEvent (tvbuff_t *tvb, proto_tree *tree, guint offset);
  * 	sequenceNumber	[1] Unsigned (0..65535),
  * 	dateTime		[2] BACnetDateTime
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1814,9 +1814,9 @@ fTimeStamp (tvbuff_t *tvb, proto_tree *tree, guint offset);
  * 	time	Time,
  * 	value	ABSTRACT-SYNTAX.&Type -- any primitive datatype, complex types cannot be decoded
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1829,9 +1829,9 @@ fTimeValue (tvbuff_t *tvb, proto_tree *tree, guint offset);
  * 	remote-vtSessionID	Unsigned8,
  * 	remote-vtAddress	BACnetAddress
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1851,9 +1851,9 @@ fVTSession (tvbuff_t *tvb, proto_tree *tree, guint offset);
  * -- third octet dayOfWeek (1..7) where 1 = Monday
  * -- 7 = Sunday
  * -- X'FF' = any day of week
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1871,9 +1871,9 @@ fWeekNDay (tvbuff_t *tvb, proto_tree *tree, guint offset);
  * 		}
  *  } OPTIONAL
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1884,9 +1884,9 @@ fReadAccessResult (tvbuff_t *tvb, proto_tree *tree, guint offset);
  * 	objectIdentifier	[0] BACnetObjectIdentifier,
  * 	listOfPropertyReferences	[1] SEQUENCE OF BACnetPropertyReference
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1897,9 +1897,9 @@ fReadAccessSpecification (tvbuff_t *tvb, proto_tree *subtree, guint offset);
  * 	objectIdentifier	[0] BACnetObjectIdentifier,
  * 	listOfProperty	[1] SEQUENCE OF BACnetPropertyValue
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1916,7 +1916,7 @@ fWriteAccessSpecification (tvbuff_t *tvb, proto_tree *subtree, guint offset);
  */
 static guint
 fTagNo (tvbuff_t *tvb, guint offset);
-                                     
+
 /**
  * splits Tag Header coresponding to 20.2.1 General Rules For BACnet Tags
  * @param tvb = "TestyVirtualBuffer"
@@ -1933,9 +1933,9 @@ fTagHeader (tvbuff_t *tvb, guint offset, guint8 *tag_no, guint8* class_tag, guin
 
 /**
  * adds processID with max 32Bit unsigned Integer Value to tree
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1943,9 +1943,9 @@ fProcessId (tvbuff_t *tvb, proto_tree *tree, guint offset);
 
 /**
  * adds timeSpan with max 32Bit unsigned Integer Value to tree
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1956,10 +1956,10 @@ fTimeSpan (tvbuff_t *tvb, proto_tree *tree, guint offset, const gchar *label);
  * BACnetPropertyIdentifier::= ENUMERATED {
  * 	 @see bacapp_property_identifier
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
- * @param tt returnvalue of this item 
+ * @param tvb
+ * @param tree
+ * @param offset
+ * @param tt returnvalue of this item
  * @return modified offset
  */
 static guint
@@ -1975,9 +1975,9 @@ fPropertyIdentifier (tvbuff_t *tvb, proto_tree *tree, guint offset);
  *  eventEnable [5] BACnetEventTransitionBits,
  *  eventPriorities [6] SEQUENCE SIZE (3) OF Unsigned
  * }
- * @param tvb 
+ * @param tvb
  * @param tree
- * @param offset 
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -1990,9 +1990,9 @@ flistOfEventSummaries (tvbuff_t *tvb, proto_tree *tree, guint offset);
  *  relationSpecifier	[2] ENUMERATED { bacapp_relationSpecifier },
  *  comparisonValue	[3] ABSTRACT-SYNTAX.&Type
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -2003,9 +2003,9 @@ fSelectionCriteria (tvbuff_t *tvb, proto_tree *tree, guint offset);
  * 	selectionLogic	[0] ENUMERATED { bacapp_selectionLogic },
  * 	listOfSelectionCriteria	[1] SelectionCriteria
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -2016,9 +2016,9 @@ fObjectSelectionCriteria (tvbuff_t *tvb, proto_tree *subtree, guint offset);
  * 	objectType	[0] BACnetObjectType,
  *  objectIdentifier	[1] BACnetObjectIdentifier
  * }
- * @param tvb 
- * @param tree 
- * @param offset 
+ * @param tvb
+ * @param tree
+ * @param offset
  * @return modified offset
  */
 static guint
@@ -2031,7 +2031,7 @@ fObjectSpecifier (tvbuff_t *tvb, proto_tree *tree, guint offset);
  *    }
  * }
  * @param tvb
- * @param tree 
+ * @param tree
  * @param offset
  * @return modified offset
  */