aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/x420
diff options
context:
space:
mode:
authorGraeme Lunt <graeme.lunt@smhs.co.uk>2010-06-28 14:24:32 +0000
committerGraeme Lunt <graeme.lunt@smhs.co.uk>2010-06-28 14:24:32 +0000
commit1d8014fab44f704e9de9ce5686a5a6849b19f572 (patch)
tree51256dc28dc7fc4b953c1cc2ce5ffa79b267cc4a /asn1/x420
parent1a4a7a718d5cf1778cc15b609b3160187b3e5fba (diff)
Removal of various warnings, mainly by not emitting functions for ASN.1 types that are only used for COMPONENTS OF.
svn path=/trunk/; revision=33350
Diffstat (limited to 'asn1/x420')
-rw-r--r--asn1/x420/packet-x420-template.h3
-rw-r--r--asn1/x420/x420.cnf13
2 files changed, 13 insertions, 3 deletions
diff --git a/asn1/x420/packet-x420-template.h b/asn1/x420/packet-x420-template.h
index 4a1ce6809b..f177712f85 100644
--- a/asn1/x420/packet-x420-template.h
+++ b/asn1/x420/packet-x420-template.h
@@ -28,4 +28,7 @@
#include "packet-x420-exp.h"
+void proto_reg_handoff_x420(void);
+void proto_register_x420(void);
+
#endif /* PACKET_X420_H */
diff --git a/asn1/x420/x420.cnf b/asn1/x420/x420.cnf
index 38de7bf252..b6a2affbe3 100644
--- a/asn1/x420/x420.cnf
+++ b/asn1/x420/x420.cnf
@@ -1,3 +1,7 @@
+# x411.cnf
+# X.420 (InterPersonal Messaging) conformance file
+# $Id$
+
#.TYPE_ATTR
Time TYPE = FT_STRING DISPLAY = BASE_NONE STRING = NULL BITMASK = 0
# Permitted-Actions-Attribute is exported from FTAM as DISPLAY = BASE_HEX -
@@ -5,9 +9,6 @@ Time TYPE = FT_STRING DISPLAY = BASE_NONE STRING = NULL BITMASK = 0
# We override the definition here until we can identify the fix correct fix
Permitted-Actions-Attribute TYPE = FT_BYTES DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
-#.MODULE_IMPORT
-MTSAbstractService x411
-
#.IMPORT ../ftam/ftam-exp.cnf
#.IMPORT ../x411/x411-exp.cnf
#.IMPORT ../p7/p7-exp.cnf
@@ -23,6 +24,12 @@ ON
ID
#.END
+#.NO_EMIT
+# These fields are only used through COMPONENTS OF,
+# and consequently generate unused code warnings
+CommonFields
+#.END
+
#.EXPORTS
ORDescriptor
InformationObject