aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/p22
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2014-02-26 14:29:17 -0500
committerBill Meier <wmeier@newsguy.com>2014-02-26 19:38:21 +0000
commit1dff4e309d036e23c316f2cf9a6d05d5a4449ff2 (patch)
treea7ff0816c598def87e246a2ebbd2d80fa47365fc /asn1/p22
parentb4850149dd877375c1d8da3a2d20bddca1d91780 (diff)
Remove trailing whitespace from asn1 .cnf & template.[hc] files. Regenerate dissectors.
Change-Id: I0e779b2ac2f608356649c5bbfca438141070dea4 Reviewed-on: https://code.wireshark.org/review/412 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'asn1/p22')
-rw-r--r--asn1/p22/p22.cnf6
-rw-r--r--asn1/p22/packet-p22-template.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/asn1/p22/p22.cnf b/asn1/p22/p22.cnf
index f66f253739..4d51ee5d8b 100644
--- a/asn1/p22/p22.cnf
+++ b/asn1/p22/p22.cnf
@@ -3,7 +3,7 @@
#.TYPE_ATTR
Time TYPE = FT_STRING DISPLAY = BASE_NONE STRING = NULL BITMASK = 0
-# Permitted-Actions-Attribute is exported from FTAM as DISPLAY = BASE_HEX -
+# Permitted-Actions-Attribute is exported from FTAM as DISPLAY = BASE_HEX -
# but this causes a runtime error.
# 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
@@ -220,9 +220,9 @@ IpnSecurityResponse B "2.6.1.18.1" "id-sec-security-common-fields"
const char *name = NULL;
%(DEFAULT_BODY)s
-
+
name = oid_resolved_from_string(actx->external.direct_reference);
- proto_item_append_text(tree, " (%%s)", name ? name : actx->external.direct_reference);
+ proto_item_append_text(tree, " (%%s)", name ? name : actx->external.direct_reference);
#.FN_BODY IPMSExtension/value
diff --git a/asn1/p22/packet-p22-template.c b/asn1/p22/packet-p22-template.c
index 3834ca59e7..f9204b3906 100644
--- a/asn1/p22/packet-p22-template.c
+++ b/asn1/p22/packet-p22-template.c
@@ -138,7 +138,7 @@ void proto_register_p22(void) {
/*--- proto_reg_handoff_p22 --- */
void proto_reg_handoff_p22(void) {
-#include "packet-p22-dis-tab.c"
+#include "packet-p22-dis-tab.c"
register_ber_oid_dissector("2.6.1.10.0", dissect_p22, proto_p22, "InterPersonal Message (1984)");
register_ber_oid_dissector("2.6.1.10.1", dissect_p22, proto_p22, "InterPersonal Message (1988)");