Don't use %s as the format string in val_to_str().
authormorriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7>
Tue, 6 Apr 2010 15:45:11 +0000 (15:45 +0000)
committermorriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7>
Tue, 6 Apr 2010 15:45:11 +0000 (15:45 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32400 f5534014-38df-0310-8fa8-9805f1628bb7

plugins/docsis/packet-bpkmreq.c
plugins/docsis/packet-dsaack.c
plugins/docsis/packet-dsarsp.c
plugins/docsis/packet-dscack.c
plugins/docsis/packet-dscrsp.c
plugins/docsis/packet-dsdrsp.c
plugins/docsis/packet-map.c
plugins/docsis/packet-regack.c

index 73cc1c10ead0449478efb41d537f08e8bdc5e7c9..7f3785101b64ad488e845e4b700d925f13af6041 100644 (file)
@@ -75,7 +75,7 @@ dissect_bpkmreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
   code = tvb_get_guint8 (tvb, 0);
 
   col_add_fstr (pinfo->cinfo, COL_INFO, "BPKM Request (%s)",
-           val_to_str (code, code_field_vals, "%s"));
+           val_to_str (code, code_field_vals, "%d"));
 
   if (tree)
     {
index 0f67bd4eb8ddd5045d448d0cf6b7c93f8445a917..0bea9056c11cd2c8b93428b1063d0be22f9b74de 100644 (file)
@@ -58,7 +58,7 @@ dissect_dsaack (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 
   col_add_fstr (pinfo->cinfo, COL_INFO,
            "Dynamic Service Add Ack ID = %u (%s)", transid,
-           val_to_str (response, docsis_conf_code, "%s"));
+           val_to_str (response, docsis_conf_code, "%d"));
 
   if (tree)
     {
index 3ae4d172f025b333ae823a056e54b8cea58f2ebb..22ef39e6e5a15380363d5aa88f1c432cf54139dd 100644 (file)
@@ -58,7 +58,7 @@ dissect_dsarsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 
   col_add_fstr (pinfo->cinfo, COL_INFO,
            "Dynamic Service Add Response ID = %u (%s)", transid,
-           val_to_str (response, docsis_conf_code, "%s"));
+           val_to_str (response, docsis_conf_code, "%d"));
 
   if (tree)
     {
index 2c844ddbcf38b0bceb4718064dc237f0c75eb5db..7e8982cccf27e9e481b1cbf7873237a9f62a9467 100644 (file)
@@ -58,7 +58,7 @@ dissect_dscack (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 
   col_add_fstr (pinfo->cinfo, COL_INFO,
            "Dynamic Service Change Ack ID = %u (%s)", transid,
-           val_to_str (response, docsis_conf_code, "%s"));
+           val_to_str (response, docsis_conf_code, "%d"));
 
   if (tree)
     {
index 13620e4968ff050c078200f182df8e70ef787246..6e85f42af0163014ade2fb4747d3d114650e5b09 100644 (file)
@@ -59,7 +59,7 @@ dissect_dscrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 
   col_add_fstr (pinfo->cinfo, COL_INFO,
            "Dynamic Service Change Response ID = %u (%s)", transid,
-           val_to_str (response, docsis_conf_code, "%s"));
+           val_to_str (response, docsis_conf_code, "%d"));
 
   if (tree)
     {
index 7364c796dee702078d7881cdb7868fe8153c1515..e52efcdae46a916f6a128a4c217af6bbb02a6a38 100644 (file)
@@ -56,7 +56,7 @@ dissect_dsdrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 
   col_add_fstr (pinfo->cinfo, COL_INFO,
            "Dynamic Service Delete Response Tran id = %u (%s)",
-           tranid, val_to_str (confcode, docsis_conf_code, "%s"));
+           tranid, val_to_str (confcode, docsis_conf_code, "%d"));
 
   if (tree)
     {
index 2b9ef13a5563668132f55db6dd4f7fff975bcb34..0d1aa1ba5a01d7e3627dc812883cead2c6e85248 100644 (file)
@@ -146,12 +146,12 @@ dissect_map (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
          if (sid == 0x3FFF)
            proto_tree_add_uint_format (map_tree, hf_docsis_map_ie, tvb, pos, 4,
                                      ie, "SID = 0x%x (All CM's), IUC = %s, Offset = %u",
-                                     sid, val_to_str (iuc, iuc_vals, "%s"),
+                                     sid, val_to_str (iuc, iuc_vals, "%d"),
                                      offset);
          else
            proto_tree_add_uint_format (map_tree, hf_docsis_map_ie, tvb, pos, 4,
                                      ie, "SID = %u, IUC = %s, Offset = %u",
-                                     sid, val_to_str (iuc, iuc_vals, "%s"),
+                                     sid, val_to_str (iuc, iuc_vals, "%d"),
                                      offset);
          pos = pos + 4;
        }                       /* for... */
index d428b09da77f71486ccba2f7c73e585be2a75f71..31f5276dc5aac3a411b0041861532e2e12517bbe 100644 (file)
@@ -58,7 +58,7 @@ dissect_regack (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 
   col_add_fstr (pinfo->cinfo, COL_INFO,
            "Registration Acknowledge SID = %u (%s)", sid,
-           val_to_str (response, docsis_conf_code, "%s"));
+           val_to_str (response, docsis_conf_code, "%d"));
   if (tree)
     {
       it =