Minor cleanup:

- Use col_...() fcns in the proper manner and order;
- proto_reg_handoff...() not needed (does nothing useful);
- remove some unneeded initializers;
- reformat hf[] entries.

svn path=/trunk/; revision=44000

1 files changed, 37 insertions, 52 deletions

diff --git a/epan/dissectors/packet-mpls-psc.c b/epan/dissectors/packet-mpls-psc.c
index e5baab0c9c..28e6491f30 100644
--- a/epan/dissectors/packet-mpls-psc.c
+++ b/epan/dissectors/packet-mpls-psc.c
@@ -49,8 +49,6 @@ static int hf_mpls_psc_fpath = -1;
 static int hf_mpls_psc_dpath = -1;
 static int hf_mpls_psc_tlvlen = -1;
 
-static dissector_handle_t mpls_psc_handle;
-
 /*
  * FF: please keep this list in sync with
  * http://www.iana.org/assignments/mpls-oam-parameters/mpls-oam-parameters.xml
@@ -117,23 +115,21 @@ const range_string mpls_psc_dpath_rvals[] = {
 static void
 dissect_mpls_psc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-    proto_item *ti       = NULL;
-    proto_tree *psc_tree = NULL;
+    proto_item *ti;
+    proto_tree *psc_tree;
     guint32     offset   = 0;
-    guint8      req      = 0;
-    guint8      fpath    = 0;
-    guint8      path     = 0;
+    guint8      req;
+    guint8      fpath;
+    guint8      path;
+
+    col_set_str(pinfo->cinfo, COL_PROTOCOL, "PSC");
+    col_clear(pinfo->cinfo, COL_INFO);
 
     /* build cinfo */
     req   = (tvb_get_guint8(tvb, offset) & 0x3C) >> 2;
     fpath = tvb_get_guint8(tvb, offset + 2);
     path  = tvb_get_guint8(tvb, offset + 3);
 
-    col_clear(pinfo->cinfo, COL_PROTOCOL);
-    col_clear(pinfo->cinfo, COL_INFO);
-
-    col_add_fstr(pinfo->cinfo, COL_PROTOCOL, "PSC");
-
     col_add_fstr(pinfo->cinfo, COL_INFO,
                  "%s(%u,%u)",
                  val_to_str(req, mpls_psc_req_short_vals, "Unknown-Request"),
@@ -144,28 +140,27 @@ dissect_mpls_psc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     }
 
     /* create display subtree for the protocol */
-    ti = proto_tree_add_item(tree, proto_mpls_psc, tvb, 0, -1, ENC_NA);
+    ti = proto_tree_add_item(tree, proto_mpls_psc,    tvb, 0, -1, ENC_NA);
     psc_tree = proto_item_add_subtree(ti, ett_mpls_psc);
     /* version */
-    proto_tree_add_item(psc_tree, hf_mpls_psc_ver, tvb, offset, 1, ENC_NA);
+    proto_tree_add_item(psc_tree, hf_mpls_psc_ver,    tvb, offset, 1, ENC_NA);
     /* request */
-    proto_tree_add_item(psc_tree, hf_mpls_psc_req, tvb, offset, 1, ENC_NA);
+    proto_tree_add_item(psc_tree, hf_mpls_psc_req,    tvb, offset, 1, ENC_NA);
     /* prot type */
-    proto_tree_add_item(psc_tree, hf_mpls_psc_pt, tvb, offset, 1, ENC_NA);
+    proto_tree_add_item(psc_tree, hf_mpls_psc_pt,     tvb, offset, 1, ENC_NA);
     offset += 1;
     /* prot type */
-    proto_tree_add_item(psc_tree, hf_mpls_psc_rev, tvb, offset, 1, ENC_NA);
+    proto_tree_add_item(psc_tree, hf_mpls_psc_rev,    tvb, offset, 1, ENC_NA);
     /* skip reserved1 */
     offset += 1;
     /* fpath */
-    proto_tree_add_item(psc_tree, hf_mpls_psc_fpath, tvb, offset, 1, ENC_NA);
+    proto_tree_add_item(psc_tree, hf_mpls_psc_fpath,  tvb, offset, 1, ENC_NA);
     offset += 1;
     /* path */
-    proto_tree_add_item(psc_tree, hf_mpls_psc_dpath, tvb, offset, 1, ENC_NA);
+    proto_tree_add_item(psc_tree, hf_mpls_psc_dpath,  tvb, offset, 1, ENC_NA);
     offset += 1;
     /* tlv len */
-    proto_tree_add_item(psc_tree, hf_mpls_psc_tlvlen, tvb, offset, 1,
-                        ENC_BIG_ENDIAN);
+    proto_tree_add_item(psc_tree, hf_mpls_psc_tlvlen, tvb, offset, 1, ENC_BIG_ENDIAN);
 }
 
 void
@@ -175,60 +170,57 @@ proto_register_mpls_psc(void)
         {
             &hf_mpls_psc_ver,
             {
-                "Version", "mpls.psc.ver", FT_UINT8, BASE_DEC, NULL,
-                0xC0, NULL, HFILL
+                "Version", "mpls.psc.ver",
+                FT_UINT8, BASE_DEC, NULL, 0xC0,
+                NULL, HFILL
             }
         },
         {
             &hf_mpls_psc_req,
             {
-                "Request", "mpls.psc.req", FT_UINT8,
-                BASE_RANGE_STRING | BASE_DEC,
-                RVALS(mpls_psc_req_rvals),
-                0x3C, NULL, HFILL
+                "Request", "mpls.psc.req",
+                FT_UINT8, BASE_RANGE_STRING | BASE_DEC, RVALS(mpls_psc_req_rvals), 0x3C,
+                NULL, HFILL
             }
         },
         {
             &hf_mpls_psc_pt,
             {
-                "Protection Type", "mpls.psc.pt", FT_UINT8,
-                BASE_RANGE_STRING | BASE_DEC,
-                RVALS(mpls_psc_pt_rvals),
-                0x03, NULL, HFILL
+                "Protection Type", "mpls.psc.pt",
+                FT_UINT8, BASE_RANGE_STRING | BASE_DEC, RVALS(mpls_psc_pt_rvals), 0x03,
+                NULL, HFILL
             }
         },
         {
             &hf_mpls_psc_rev,
             {
-                "R", "mpls.psc.rev", FT_UINT8,
-                BASE_RANGE_STRING | BASE_DEC,
-                RVALS(mpls_psc_rev_rvals),
-                0x80, NULL, HFILL
+                "R", "mpls.psc.rev",
+                FT_UINT8, BASE_RANGE_STRING | BASE_DEC, RVALS(mpls_psc_rev_rvals), 0x80,
+                NULL, HFILL
             }
         },
         {
             &hf_mpls_psc_fpath,
             {
-                "Fault Path", "mpls.psc.fpath", FT_UINT8,
-                BASE_RANGE_STRING | BASE_DEC,
-                RVALS(mpls_psc_fpath_rvals),
-                0x0, NULL, HFILL
+                "Fault Path", "mpls.psc.fpath",
+                FT_UINT8, BASE_RANGE_STRING | BASE_DEC, RVALS(mpls_psc_fpath_rvals), 0x0,
+                NULL, HFILL
             }
         },
         {
             &hf_mpls_psc_dpath,
             {
-                "Data Path", "mpls.psc.dpath", FT_UINT8,
-                BASE_RANGE_STRING | BASE_DEC,
-                RVALS(mpls_psc_dpath_rvals),
-                0x0, NULL, HFILL
+                "Data Path", "mpls.psc.dpath",
+                FT_UINT8, BASE_RANGE_STRING | BASE_DEC, RVALS(mpls_psc_dpath_rvals), 0x0,
+                NULL, HFILL
             }
         },
         {
             &hf_mpls_psc_tlvlen,
             {
-                "TLV Length", "mpls.psc.tlvlen", FT_UINT16, BASE_DEC, NULL,
-                0x0, NULL, HFILL
+                "TLV Length", "mpls.psc.tlvlen",
+                FT_UINT16, BASE_DEC, NULL, 0x0,
+                NULL, HFILL
             }
         },
     };
@@ -248,13 +240,6 @@ proto_register_mpls_psc(void)
     register_dissector("mpls_psc", dissect_mpls_psc, proto_mpls_psc);
 }
 
-void
-proto_reg_handoff_mpls_psc(void)
-{
-    mpls_psc_handle =
-        create_dissector_handle(dissect_mpls_psc, proto_mpls_psc);
-}
-
 /*
  * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
  *