Fix "no previous declaration" warnings

Remove trailing ^M (cr) from some files

svn path=/trunk/; revision=15175

4 files changed, 151 insertions, 151 deletions

diff --git a/asn1/MAP_Dialogue/MAP_DialoguePDU.asn b/asn1/MAP_Dialogue/MAP_DialoguePDU.asn
index f95acfc23e..40547437eb 100644
--- a/asn1/MAP_Dialogue/MAP_DialoguePDU.asn
+++ b/asn1/MAP_Dialogue/MAP_DialoguePDU.asn
@@ -1,143 +1,143 @@
-MAP-DialogueInformation {

-	itu-t identified-organization (4) etsi (0) mobileDomain (0)

-	gsm-Network (1) modules (3) map-DialogueInformation (3) version9 (9)}

-

-DEFINITIONS

-

-IMPLICIT TAGS

-	::=

-

-BEGIN

-

-EXPORTS

-	map-DialogueAS,

-	MAP-DialoguePDU,

-	map-ProtectedDialogueAS,

-	MAP-ProtectedDialoguePDU

-	;

-

-IMPORTS

-	gsm-NetworkId,

-	as-Id

-FROM MobileDomainDefinitions {

-	itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)

-	mobileDomainDefinitions (0) version1 (1)}

-

-	AddressString

-FROM MAP-CommonDataTypes {

-	itu-t identified-organization (4) etsi (0) mobileDomain (0)

-	gsm-Network(1) modules (3) map-CommonDataTypes (18) version9 (9)}

-

-	ExtensionContainer

-FROM MAP-ExtensionDataTypes {

-	itu-t identified-organization (4) etsi (0) mobileDomain (0)

-	gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version9 (9)}

-

-	SecurityHeader,

-	ProtectedPayload

-FROM MAP-ST-DataTypes {

-	itu-t identified-organization (4) etsi (0) mobileDomain (0)

-	gsm-Network (1) modules (3) map-ST-DataTypes (27) version9 (9)}

-;

--- abstract syntax name for MAP-DialoguePDU

-

-map-DialogueAS OBJECT IDENTIFIER ::=

-	{gsm-NetworkId as-Id map-DialoguePDU (1) version1 (1)}

-;

-

-MAP-DialoguePDU ::= CHOICE {

-	map-open 		[0] IMPLICIT MAP-OpenInfo,

-	map-accept 		[1] IMPLICIT MAP-AcceptInfo,

-	map-close 		[2] IMPLICIT MAP-CloseInfo,

-	map-refuse 		[3] IMPLICIT MAP-RefuseInfo,

-	map-userAbort 		[4] IMPLICIT MAP-UserAbortInfo,

-	map-providerAbort 	[5] IMPLICIT MAP-ProviderAbortInfo}

-

-MAP-OpenInfo ::= SEQUENCE {

-	destinationReference [0] IMPLICIT AddressString OPTIONAL,

-	originationReference [1] IMPLICIT AddressString OPTIONAL,

-	...,

-	extensionContainer ExtensionContainer OPTIONAL

--- extensionContainer must not be used in version 2

-}

-

-MAP-AcceptInfo ::= SEQUENCE {

-	...,

-	extensionContainer ExtensionContainer OPTIONAL

--- extensionContainer must not be used in version 2

-}

-

-MAP-CloseInfo ::= SEQUENCE {

-	...,

-	extensionContainer ExtensionContainer OPTIONAL

--- extensionContainer must not be used in version 2

-}

-

-MAP-RefuseInfo ::= SEQUENCE {

-	reason Reason,

-	...,

-	extensionContainer ExtensionContainer OPTIONAL,

--- extensionContainer must not be used in version 2

-	alternativeApplicationContext OBJECT IDENTIFIER OPTIONAL

--- alternativeApplicationContext must not be used in version 2

-}

-

-Reason ::= ENUMERATED {

-	noReasonGiven (0),

-	invalidDestinationReference (1),

-	invalidOriginatingReference (2),

-	encapsulatedAC-NotSupported (3) ,

-	transportProtectionNotAdequate (4)}

--- encapsulatedAC-NotSupported and transportProtectionNotAdequate must not be used in

--- dialogues with an AC different from secureTransportHandling

-

-MAP-UserAbortInfo ::= SEQUENCE {

-	map-UserAbortChoice MAP-UserAbortChoice,

-	...,

-	extensionContainer ExtensionContainer OPTIONAL

--- extensionContainer must not be used in version 2

-}

-

-MAP-UserAbortChoice ::= CHOICE {

-	userSpecificReason 			[0] IMPLICIT NULL,

-	userResourceLimitation 			[1] IMPLICIT NULL,

-	resourceUnavailable 			[2] IMPLICIT ResourceUnavailableReason,

-	applicationProcedureCancellation 	[3] IMPLICIT ProcedureCancellationReason}

-

-ResourceUnavailableReason ::= ENUMERATED {

-	shortTermResourceLimitation (0),

-	longTermResourceLimitation (1)}

-

-ProcedureCancellationReason ::= ENUMERATED {

-	handoverCancellation (0),

-	radioChannelRelease (1),

-	networkPathRelease (2),

-	callRelease (3),

-	associatedProcedureFailure (4),

-	tandemDialogueRelease (5),

-	remoteOperationsFailure (6)}

-

-MAP-ProviderAbortInfo ::= SEQUENCE {

-	map-ProviderAbortReason MAP-ProviderAbortReason,

-	...,

-	extensionContainer ExtensionContainer OPTIONAL

--- extensionContainer must not be used in version 2

-}

-

-MAP-ProviderAbortReason ::= ENUMERATED {

-	abnormalDialogue (0),

-	invalidPDU (1)}

--- abstract syntax name for MAP-ProtectedDialoguePDU

-map-ProtectedDialogueAS OBJECT IDENTIFIER ::=

-	{gsm-NetworkId as-Id map-ProtectedDialoguePDU (3) version1 (1)}

-

-MAP-ProtectedDialoguePDU ::= SEQUENCE {

-	encapsulatedAC OBJECT IDENTIFIER,

-	securityHeader SecurityHeader OPTIONAL,

-	protectedPayload ProtectedPayload OPTIONAL,

-	...}

--- The protectedPayload carries the result of applying the security function

--- defined in 3GPP TS 33.200 to the encoding of the securely transported

--- MAP-DialoguePDU

-

-END

+MAP-DialogueInformation {
+	itu-t identified-organization (4) etsi (0) mobileDomain (0)
+	gsm-Network (1) modules (3) map-DialogueInformation (3) version9 (9)}
+
+DEFINITIONS
+
+IMPLICIT TAGS
+	::=
+
+BEGIN
+
+EXPORTS
+	map-DialogueAS,
+	MAP-DialoguePDU,
+	map-ProtectedDialogueAS,
+	MAP-ProtectedDialoguePDU
+	;
+
+IMPORTS
+	gsm-NetworkId,
+	as-Id
+FROM MobileDomainDefinitions {
+	itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
+	mobileDomainDefinitions (0) version1 (1)}
+
+	AddressString
+FROM MAP-CommonDataTypes {
+	itu-t identified-organization (4) etsi (0) mobileDomain (0)
+	gsm-Network(1) modules (3) map-CommonDataTypes (18) version9 (9)}
+
+	ExtensionContainer
+FROM MAP-ExtensionDataTypes {
+	itu-t identified-organization (4) etsi (0) mobileDomain (0)
+	gsm-Network (1) modules (3) map-ExtensionDataTypes (21) version9 (9)}
+
+	SecurityHeader,
+	ProtectedPayload
+FROM MAP-ST-DataTypes {
+	itu-t identified-organization (4) etsi (0) mobileDomain (0)
+	gsm-Network (1) modules (3) map-ST-DataTypes (27) version9 (9)}
+;
+-- abstract syntax name for MAP-DialoguePDU
+
+map-DialogueAS OBJECT IDENTIFIER ::=
+	{gsm-NetworkId as-Id map-DialoguePDU (1) version1 (1)}
+;
+
+MAP-DialoguePDU ::= CHOICE {
+	map-open 		[0] IMPLICIT MAP-OpenInfo,
+	map-accept 		[1] IMPLICIT MAP-AcceptInfo,
+	map-close 		[2] IMPLICIT MAP-CloseInfo,
+	map-refuse 		[3] IMPLICIT MAP-RefuseInfo,
+	map-userAbort 		[4] IMPLICIT MAP-UserAbortInfo,
+	map-providerAbort 	[5] IMPLICIT MAP-ProviderAbortInfo}
+
+MAP-OpenInfo ::= SEQUENCE {
+	destinationReference [0] IMPLICIT AddressString OPTIONAL,
+	originationReference [1] IMPLICIT AddressString OPTIONAL,
+	...,
+	extensionContainer ExtensionContainer OPTIONAL
+-- extensionContainer must not be used in version 2
+}
+
+MAP-AcceptInfo ::= SEQUENCE {
+	...,
+	extensionContainer ExtensionContainer OPTIONAL
+-- extensionContainer must not be used in version 2
+}
+
+MAP-CloseInfo ::= SEQUENCE {
+	...,
+	extensionContainer ExtensionContainer OPTIONAL
+-- extensionContainer must not be used in version 2
+}
+
+MAP-RefuseInfo ::= SEQUENCE {
+	reason Reason,
+	...,
+	extensionContainer ExtensionContainer OPTIONAL,
+-- extensionContainer must not be used in version 2
+	alternativeApplicationContext OBJECT IDENTIFIER OPTIONAL
+-- alternativeApplicationContext must not be used in version 2
+}
+
+Reason ::= ENUMERATED {
+	noReasonGiven (0),
+	invalidDestinationReference (1),
+	invalidOriginatingReference (2),
+	encapsulatedAC-NotSupported (3) ,
+	transportProtectionNotAdequate (4)}
+-- encapsulatedAC-NotSupported and transportProtectionNotAdequate must not be used in
+-- dialogues with an AC different from secureTransportHandling
+
+MAP-UserAbortInfo ::= SEQUENCE {
+	map-UserAbortChoice MAP-UserAbortChoice,
+	...,
+	extensionContainer ExtensionContainer OPTIONAL
+-- extensionContainer must not be used in version 2
+}
+
+MAP-UserAbortChoice ::= CHOICE {
+	userSpecificReason 			[0] IMPLICIT NULL,
+	userResourceLimitation 			[1] IMPLICIT NULL,
+	resourceUnavailable 			[2] IMPLICIT ResourceUnavailableReason,
+	applicationProcedureCancellation 	[3] IMPLICIT ProcedureCancellationReason}
+
+ResourceUnavailableReason ::= ENUMERATED {
+	shortTermResourceLimitation (0),
+	longTermResourceLimitation (1)}
+
+ProcedureCancellationReason ::= ENUMERATED {
+	handoverCancellation (0),
+	radioChannelRelease (1),
+	networkPathRelease (2),
+	callRelease (3),
+	associatedProcedureFailure (4),
+	tandemDialogueRelease (5),
+	remoteOperationsFailure (6)}
+
+MAP-ProviderAbortInfo ::= SEQUENCE {
+	map-ProviderAbortReason MAP-ProviderAbortReason,
+	...,
+	extensionContainer ExtensionContainer OPTIONAL
+-- extensionContainer must not be used in version 2
+}
+
+MAP-ProviderAbortReason ::= ENUMERATED {
+	abnormalDialogue (0),
+	invalidPDU (1)}
+-- abstract syntax name for MAP-ProtectedDialoguePDU
+map-ProtectedDialogueAS OBJECT IDENTIFIER ::=
+	{gsm-NetworkId as-Id map-ProtectedDialoguePDU (3) version1 (1)}
+
+MAP-ProtectedDialoguePDU ::= SEQUENCE {
+	encapsulatedAC OBJECT IDENTIFIER,
+	securityHeader SecurityHeader OPTIONAL,
+	protectedPayload ProtectedPayload OPTIONAL,
+	...}
+-- The protectedPayload carries the result of applying the security function
+-- defined in 3GPP TS 33.200 to the encoding of the securely transported
+-- MAP-DialoguePDU
+
+END
diff --git a/asn1/MAP_Dialogue/MAP_DialoguePDU.cnf b/asn1/MAP_Dialogue/MAP_DialoguePDU.cnf
index d4dfbeea4d..47d476ac21 100644
--- a/asn1/MAP_Dialogue/MAP_DialoguePDU.cnf
+++ b/asn1/MAP_Dialogue/MAP_DialoguePDU.cnf
@@ -3,11 +3,11 @@
 
 # $Id$
 
-#.MODULE_IMPORT

-MAP-CommonDataTypes gsm_map

-MAP-ExtensionDataTypes gsm_map

-MAP-ST-DataTypes gsm_map

-

+#.MODULE_IMPORT
+MAP-CommonDataTypes gsm_map
+MAP-ExtensionDataTypes gsm_map
+MAP-ST-DataTypes gsm_map
+
 #.INCLUDE ../gsmmap/gsm_map-exp.cnf
 
 #.EXPORTS
diff --git a/asn1/MAP_Dialogue/packet-MAP-DialoguePDU-template.c b/asn1/MAP_Dialogue/packet-MAP-DialoguePDU-template.c
index 0a1247a0e2..be76663a90 100644
--- a/asn1/MAP_Dialogue/packet-MAP-DialoguePDU-template.c
+++ b/asn1/MAP_Dialogue/packet-MAP-DialoguePDU-template.c
@@ -34,7 +34,7 @@
 #include <string.h>
 
 #include "packet-ber.h"
-#include "packet-gsm_map.h"

+#include "packet-gsm_map.h"
 
 #define PNAME  "MAP_DialoguePDU"
 #define PSNAME "MAP_DialoguePDU"
@@ -49,7 +49,7 @@ int proto_MAP_DialoguePDU = -1;
 
 #include "packet-MAP_DialoguePDU-fn.c"
 
-void
+static void
 dissect_MAP_Dialogue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 {
   dissect_MAP_DialoguePDU_MAP_DialoguePDU(FALSE, tvb, 0, pinfo, parent_tree, -1);
diff --git a/epan/dissectors/packet-MAP_DialoguePDU.c b/epan/dissectors/packet-MAP_DialoguePDU.c
index cc117281dd..129d5d8633 100644
--- a/epan/dissectors/packet-MAP_DialoguePDU.c
+++ b/epan/dissectors/packet-MAP_DialoguePDU.c
@@ -407,7 +407,7 @@ dissect_MAP_DialoguePDU_MAP_ProtectedDialoguePDU(gboolean implicit_tag _U_, tvbu
 /*--- End of included file: packet-MAP_DialoguePDU-fn.c ---*/
 
 
-void
+static void
 dissect_MAP_Dialogue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 {
   dissect_MAP_DialoguePDU_MAP_DialoguePDU(FALSE, tvb, 0, pinfo, parent_tree, -1);