diff options
| author | Bill Meier <wmeier@newsguy.com> | 2014-02-26 14:29:17 -0500 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2014-02-26 19:38:21 +0000 |
| commit | 1dff4e309d036e23c316f2cf9a6d05d5a4449ff2 (patch) | |
| tree | a7ff0816c598def87e246a2ebbd2d80fa47365fc /asn1/ros | |
| parent | b4850149dd877375c1d8da3a2d20bddca1d91780 (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/ros')
| -rw-r--r-- | asn1/ros/packet-ros-template.h | 2 | ||||
| -rw-r--r-- | asn1/ros/ros-err.cnf | 4 | ||||
| -rw-r--r-- | asn1/ros/ros-inv.cnf | 2 | ||||
| -rw-r--r-- | asn1/ros/ros-res.cnf | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/asn1/ros/packet-ros-template.h b/asn1/ros/packet-ros-template.h index e2a00837b0..3ee979b775 100644 --- a/asn1/ros/packet-ros-template.h +++ b/asn1/ros/packet-ros-template.h @@ -29,7 +29,7 @@ # include "packet-ses.h" /* for use in the SESSION_DATA_STRUCTURE ros_op argument - top byte indicates ROS invocation + top byte indicates ROS invocation bottom three bytes indicate operation code */ # define ROS_OP_MASK 0xff000000 diff --git a/asn1/ros/ros-err.cnf b/asn1/ros/ros-err.cnf index af9e90cdac..76aa331dcb 100644 --- a/asn1/ros/ros-err.cnf +++ b/asn1/ros/ros-err.cnf @@ -18,7 +18,7 @@ err_handle = NULL; } - if (!err_handle || + if (!err_handle || !proto_is_protocol_enabled(find_protocol_by_id(dissector_handle_get_protocol_index(err_handle)))) { if (actx->rose_ctx->d.code == 0) descr = wmem_strdup_printf(wmem_packet_scope(), "ERR: %d", actx->rose_ctx->d.code_local); @@ -39,7 +39,7 @@ err_next_tvb = tvb_new_subset(tvb, (actx->encoding==ASN1_ENC_PER)?offset>>3:offset, 0, 0); } - call_dissector_with_data((err_handle)?err_handle:data_handle, err_next_tvb, actx->pinfo, tree, actx->rose_ctx); + call_dissector_with_data((err_handle)?err_handle:data_handle, err_next_tvb, actx->pinfo, tree, actx->rose_ctx); if (!err_handle) { expert_add_info_format(actx->pinfo, tree, &ei_ros_undecoded, "Undecoded %s", descr); } diff --git a/asn1/ros/ros-inv.cnf b/asn1/ros/ros-inv.cnf index f6289e65d5..1bc9251c49 100644 --- a/asn1/ros/ros-inv.cnf +++ b/asn1/ros/ros-inv.cnf @@ -18,7 +18,7 @@ arg_handle = NULL; } - if (!arg_handle || + if (!arg_handle || !proto_is_protocol_enabled(find_protocol_by_id(dissector_handle_get_protocol_index(arg_handle)))) { if (actx->rose_ctx->d.code == 0) descr = wmem_strdup_printf(wmem_packet_scope(), "INV: %d", actx->rose_ctx->d.code_local); diff --git a/asn1/ros/ros-res.cnf b/asn1/ros/ros-res.cnf index eae08ce24c..f0900906cb 100644 --- a/asn1/ros/ros-res.cnf +++ b/asn1/ros/ros-res.cnf @@ -19,7 +19,7 @@ res_handle = NULL; } - if (!res_handle || + if (!res_handle || !proto_is_protocol_enabled(find_protocol_by_id(dissector_handle_get_protocol_index(res_handle)))) { if (actx->rose_ctx->d.code == 0) descr = wmem_strdup_printf(wmem_packet_scope(), "RES: %d", actx->rose_ctx->d.code_local); @@ -41,7 +41,7 @@ res_next_tvb = tvb_new_subset(tvb, (actx->encoding==ASN1_ENC_PER)?offset>>3:offset, 0, 0); } - call_dissector_with_data((res_handle)?res_handle:data_handle, res_next_tvb, actx->pinfo, tree, actx->rose_ctx); + call_dissector_with_data((res_handle)?res_handle:data_handle, res_next_tvb, actx->pinfo, tree, actx->rose_ctx); if (!res_handle) { expert_add_info_format(actx->pinfo, tree, &ei_ros_undecoded, "Undecoded %s", descr); } |