diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2017-04-02 12:34:44 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-04-02 16:40:28 +0000 |
| commit | 9d1f2efa51b529b7bbf453919bf6b35546545637 (patch) | |
| tree | eec7ec93e81702fe8164cd923e284e5ffe9e9b35 /epan/dissectors/packet-dnp.c | |
| parent | 522532643f18e879da8706a2a0327d2feae84d2f (diff) | |
Use col_append_sep_str() for fixed strings
Change from col_append_sep_fstr() to col_append_sep_str() when
appending strings without formatting.
Change-Id: I315aca9b815c204a5bc78f7326402c40d1325f0e
Reviewed-on: https://code.wireshark.org/review/20846
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-dnp.c')
| -rw-r--r-- | epan/dissectors/packet-dnp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c index 596c16c013..0f23291964 100644 --- a/epan/dissectors/packet-dnp.c +++ b/epan/dissectors/packet-dnp.c @@ -2816,7 +2816,7 @@ dissect_dnp3_al(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Clear out lower layer info */ col_clear(pinfo->cinfo, COL_INFO); - col_append_sep_fstr(pinfo->cinfo, COL_INFO, NULL, "%s", func_code_str); + col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, func_code_str); col_set_fence(pinfo->cinfo, COL_INFO); /* format up the text representation */ @@ -2873,7 +2873,7 @@ dissect_dnp3_al(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) default: /* For reads for specific object types, bit-mask out the first byte and add the generic obj description to the column info */ obj_type_str = val_to_str_ext((obj_type & 0xFF00), &dnp3_al_read_obj_vals_ext, "Unknown Object Type"); - col_append_sep_fstr(pinfo->cinfo, COL_INFO, NULL, "%s", obj_type_str); + col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, obj_type_str); break; } @@ -2881,7 +2881,7 @@ dissect_dnp3_al(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Update the col info if there were class reads */ if (al_class != 0) { - col_append_sep_fstr(pinfo->cinfo, COL_INFO, NULL, "Class "); + col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Class "); for (i = 0; i < 4; i++) { if (al_class & (1 << i)) { col_append_fstr(pinfo->cinfo, COL_INFO, "%u", i); @@ -2902,7 +2902,7 @@ dissect_dnp3_al(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* For writes for specific object types, bit-mask out the first byte and add the generic obj description to the column info */ obj_type_str = val_to_str_ext((obj_type & 0xFF00), &dnp3_al_write_obj_vals_ext, "Unknown Object Type"); - col_append_sep_fstr(pinfo->cinfo, COL_INFO, NULL, "%s", obj_type_str); + col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, obj_type_str); } |