From Kovarththanan Rajaratnam:

Remove trailing spaces in protocol/field names

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28978 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/asn1/s1ap/packet-s1ap-template.c b/asn1/s1ap/packet-s1ap-template.c
index cb01f18ce7985e4a9bf01841edceb90a3371625b..9f5fb6a58202ce0b7f9b1f4066014d2a960e4adb 100644 (file)
--- a/asn1/s1ap/packet-s1ap-template.c
+++ b/asn1/s1ap/packet-s1ap-template.c
@@ -52,7 +52,7 @@
 #pragma warning(disable:4146)
 #endif
 
-#define PNAME  "S1 Application Protocol "
+#define PNAME  "S1 Application Protocol"
 #define PSNAME "S1AP"
 #define PFNAME "s1ap"
 

diff --git a/diameter/TGPPGmb.xml b/diameter/TGPPGmb.xml
index 5f125ffe711613b3dc77dc456b4a00f2670b74df..d1b53dee0255d5c84dc26d1327c67f2071bb07d6 100644 (file)
--- a/diameter/TGPPGmb.xml
+++ b/diameter/TGPPGmb.xml
@@ -136,7 +136,7 @@
                        <type type-name="OctetString"/>
                </avp>
 
-               <avp name="MBMS-Session-Identity-Repetition-Number " code="912" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+               <avp name="MBMS-Session-Identity-Repetition-Number" code="912" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Unsigned32"/>
                </avp>
                <avp name="MBMS-Required-QoS" code="913" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">

diff --git a/diameter/chargecontrol.xml b/diameter/chargecontrol.xml
index 648b9db66f9beaeff80acfb3b289908e3145869f..4d4879b58331f131d5acee323c18e4f376e7eaa7 100644 (file)
--- a/diameter/chargecontrol.xml
+++ b/diameter/chargecontrol.xml
@@ -179,7 +179,7 @@
                </avp>
                <avp name="Used-Service-Unit" code="446" mandatory="must">
                        <grouped>
-                               <gavp name="Tariff-Change-Usage "/>
+                               <gavp name="Tariff-Change-Usage"/>
                                <gavp name="CC-Time"/>
                                <gavp name="CC-Money"/>
                                <gavp name="CC-Total-Octets"/>
@@ -252,7 +252,7 @@
                        <grouped>
                                <gavp name="G-S-U-Pool-Identifier"/>
                                <gavp name="CC-Unit-Type"/>
-                               <gavp name="Unit-Value "/>
+                               <gavp name="Unit-Value"/>
                        </grouped>
                </avp>
                <avp name="User-Equipment-Info" code="458" mandatory="may">

diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml
index 5db9f15a3d7724953c742e2406c089fa08e0b19d..a80bd995227051e2e3cad928236ef1371911a7c8 100644 (file)
--- a/diameter/dictionary.xml
+++ b/diameter/dictionary.xml
@@ -764,7 +764,7 @@
                        <enum name="xDSL - Digital Subscriber Line of unknown type" code="16"/>
                        <enum name="Cable" code="17"/>
                        <enum name="Wireless - Other" code="18"/>
-                       <enum name="Wireless - IEEE 802.11  " code="19"/>
+                       <enum name="Wireless - IEEE 802.11" code="19"/>
                        <enum name="Token-Ring" code="20"/>
                        <enum name="FDDI" code="21"/>
                        <enum name="Wireless - CDMA2000" code="22"/>
@@ -887,7 +887,7 @@ http://www.iana.org/assignments/radius-types
                        <enum name="Invalid Request" code="404"/>
                        <enum name="Unsupported Service" code="405"/>
                        <enum name="Unsupported Extension" code="406"/>
-                       <enum name="Invalid Attribute Value " code="407"/>              
+                       <enum name="Invalid Attribute Value" code="407"/>              
                        <enum name="Administratively Prohibited" code="501"/>
                        <enum name="Request Not Routable (Proxy)" code="502"/>
                        <enum name="Session Context Not Found" code="503"/>
@@ -1149,7 +1149,7 @@ http://www.iana.org/assignments/radius-types
                        <enum name="DIAMETER_CONTRADICTING_AVPS" code="5007"/>
                        <enum name="DIAMETER_AVP_NOT_ALLOWED" code="5008"/>
                        <enum name="DIAMETER_AVP_OCCURS_TOO_MANY_TIMES" code="5009"/>
-                       <enum name="DIAMETER_NO_COMMON_APPLICATION " code="5010"/>
+                       <enum name="DIAMETER_NO_COMMON_APPLICATION" code="5010"/>
                        <enum name="DIAMETER_UNSUPPORTED_VERSION" code="5011"/>
                        <enum name="DIAMETER_UNABLE_TO_COMPLY" code="5012"/>
                        <enum name="DIAMETER_INVALID_BIT_IN_HEADER" code="5013"/>
@@ -1641,7 +1641,7 @@ Note: The AVP codes from 800 to 822 are reserved for TS 32.299.
                <avp name="Terminating-IOI" code="840" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
                        <type type-name="UTF8String"/>
                </avp>
-               <avp name="IMS-Charging-Identifier " code="841" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
+               <avp name="IMS-Charging-Identifier" code="841" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
                        <type type-name="UTF8String"/>
                </avp>
                <avp name="SDP-Session-Description" code="842" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
@@ -3065,7 +3065,7 @@ Note: The AVP codes from 1289 to 1399 are reserved for TS 32.299
                </avp>
                <avp name="All-APN-Configurations-Included-Indicator" code="1428" vendor-bit="must" vendor-id="TGPP">
        <type type-name="Enumerated"/>
-      <enum name="ALL_APN_CONFIGURATIONS_INCLUDED " code="0"/>
+      <enum name="ALL_APN_CONFIGURATIONS_INCLUDED" code="0"/>
       <enum name="MODIFIED/ADDED_APN_CONFIGURATIONS_INCLUDED" code="1"/>
                </avp>
                <avp name="APN-Configuration-Profile" code="1429" vendor-bit="must" vendor-id="TGPP">
@@ -3235,7 +3235,7 @@ Note: The AVP codes from 1289 to 1399 are reserved for TS 32.299
     </avp>
                <avp name="Complete-Data-List-Included-Indicator" code="1468" vendor-bit="must" vendor-id="TGPP">
       <type type-name="Enumerated"/>
-      <enum name="ALL_PDP_CONTEXTS_INCLUDED " code="0"/>
+      <enum name="ALL_PDP_CONTEXTS_INCLUDED" code="0"/>
       <enum name="MODIFIED/ADDED_PDP CONTEXTS_INCLUDED" code="1"/>
     </avp>
                <avp name="PDP-Context" code="1469" vendor-bit="must" vendor-id="TGPP">

diff --git a/epan/dissectors/ncp2222.py b/epan/dissectors/ncp2222.py
index 175c3fa8c561659cf6d9d3f087cc28a22804de38..423ac9e60676dc1330934ab397a10e744fa6c3df 100755 (executable)
--- a/epan/dissectors/ncp2222.py
+++ b/epan/dissectors/ncp2222.py
@@ -7489,16 +7489,16 @@ proto_register_ncp2222(void)
         { "Port", "ncp.ndsport", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
        { &hf_mv_string,
-       { "Attribute Name ", "ncp.mv_string", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+       { "Attribute Name", "ncp.mv_string", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
        { &hf_nds_syntax,
-       { "Attribute Syntax ", "ncp.nds_syntax", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+       { "Attribute Syntax", "ncp.nds_syntax", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
        { &hf_value_string,
-       { "Value ", "ncp.value_string", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+       { "Value", "ncp.value_string", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_nds_stream_name,
-       { "Stream Name ", "ncp.nds_stream_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+       { "Stream Name", "ncp.nds_stream_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
        { &hf_nds_buffer_size,
        { "NDS Reply Buffer Size", "ncp.nds_reply_buf", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},

diff --git a/epan/dissectors/packet-cpfi.c b/epan/dissectors/packet-cpfi.c
index 49cd7584a01552fc635eed9cd3c05406ced44630..77e20294206e443f87727cac7d8e18203b277cca 100644 (file)
--- a/epan/dissectors/packet-cpfi.c
+++ b/epan/dissectors/packet-cpfi.c
@@ -502,7 +502,7 @@ proto_register_cpfi(void)
 
 
   /* Register the protocol name and description */
-  proto_cpfi = proto_register_protocol("Cross Point Frame Injector ", "CPFI",  "cpfi");
+  proto_cpfi = proto_register_protocol("Cross Point Frame Injector", "CPFI",  "cpfi");
 
   /* Required function calls to register the header fields and subtrees used */
   proto_register_field_array(proto_cpfi, hf, array_length(hf));

diff --git a/epan/dissectors/packet-dcerpc-rdaclif.c b/epan/dissectors/packet-dcerpc-rdaclif.c
index d0e9037c54a982d050d2618002a58fe2ab8cd1a1..e45f064beac130886086c44601a8902dc04eee8c 100644 (file)
--- a/epan/dissectors/packet-dcerpc-rdaclif.c
+++ b/epan/dissectors/packet-dcerpc-rdaclif.c
@@ -79,7 +79,7 @@ proto_register_rdaclif (void)
     &ett_rdaclif,
   };
   proto_rdaclif =
-    proto_register_protocol ("DCE/RPC Directory Acl Interface ", "rdaclif",
+    proto_register_protocol ("DCE/RPC Directory Acl Interface", "rdaclif",
                             "rdaclif");
   proto_register_field_array (proto_rdaclif, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));

diff --git a/epan/dissectors/packet-dcerpc-rs_prop_acct.c b/epan/dissectors/packet-dcerpc-rs_prop_acct.c
index 578584a964c9f6263be92269030e1e524b270fdb..eab449e02d6f508a28540e2e1ad80cfa27b791d3 100644 (file)
--- a/epan/dissectors/packet-dcerpc-rs_prop_acct.c
+++ b/epan/dissectors/packet-dcerpc-rs_prop_acct.c
@@ -70,7 +70,7 @@ proto_register_rs_prop_acct (void)
        static gint *ett[] = {
                &ett_rs_prop_acct,
        };
-       proto_rs_prop_acct = proto_register_protocol ("DCE/RPC RS_PROP_ACCT ", "rs_prop_acct", "rs_prop_acct");
+       proto_rs_prop_acct = proto_register_protocol ("DCE/RPC RS_PROP_ACCT", "rs_prop_acct", "rs_prop_acct");
        proto_register_field_array (proto_rs_prop_acct, hf, array_length (hf));
        proto_register_subtree_array (ett, array_length (ett));
 }

diff --git a/epan/dissectors/packet-dcerpc-rs_prop_acl.c b/epan/dissectors/packet-dcerpc-rs_prop_acl.c
index 51a2d17c9113b0dbf1131f0433fbf76f67e06e47..f03e97fd22e956c26e154e37f7e66e8eb20acbbd 100644 (file)
--- a/epan/dissectors/packet-dcerpc-rs_prop_acl.c
+++ b/epan/dissectors/packet-dcerpc-rs_prop_acl.c
@@ -72,7 +72,7 @@ proto_register_rs_prop_acl (void)
   };
   proto_rs_prop_acl =
     proto_register_protocol
-    ("DCE/RPC Registry server propagation interface - ACLs. ", "rs_prop_acl",
+    ("DCE/RPC Registry server propagation interface - ACLs", "rs_prop_acl",
      "rs_prop_acl");
   proto_register_field_array (proto_rs_prop_acl, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));

diff --git a/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c b/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c
index 02113600547f110e2dba4d4469ae50f68bc968ae..d1dfc2fc84a3fb8f0829950f5566898f92ae5669 100644 (file)
--- a/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c
+++ b/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c
@@ -79,7 +79,7 @@ proto_register_rs_pwd_mgmt (void)
     &ett_rs_pwd_mgmt,
   };
   proto_rs_pwd_mgmt =
-    proto_register_protocol ("DCE/RPC Registry Password Management ",
+    proto_register_protocol ("DCE/RPC Registry Password Management",
                             "rs_pwd_mgmt", "rs_pwd_mgmt");
   proto_register_field_array (proto_rs_pwd_mgmt, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));

diff --git a/epan/dissectors/packet-ipars.c b/epan/dissectors/packet-ipars.c
index 37371d89518bf077080de97afb9aff2d31048e83..b4419f6cdc9d2d9494ce94763f03ff9e4c5f4f96 100644 (file)
--- a/epan/dissectors/packet-ipars.c
+++ b/epan/dissectors/packet-ipars.c
@@ -181,7 +181,7 @@ proto_register_ipars(void)
                &ett_ipars,
        };
 
-       proto_ipars = proto_register_protocol("International Passenger Airline Reservation System ", "IPARS", "ipars");         /* name, short name, abbrev */
+       proto_ipars = proto_register_protocol("International Passenger Airline Reservation System", "IPARS", "ipars");          /* name, short name, abbrev */
        proto_register_subtree_array(ett, array_length(ett));
 
        register_dissector("ipars", dissect_ipars, proto_ipars);

diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c
index 55e0f3a8df92c9764614e89d6196c98f097d8bf1..f3fb9383814c757197a85dde18b9f6920b050651 100644 (file)
--- a/epan/dissectors/packet-isup.c
+++ b/epan/dissectors/packet-isup.c
@@ -8293,7 +8293,7 @@ proto_register_bicc(void)
        static gint *ett[] = {
                &ett_bicc
        };
-       proto_bicc = proto_register_protocol("Bearer Independent Call Control ",
+       proto_bicc = proto_register_protocol("Bearer Independent Call Control",
            "BICC", "bicc");
 /* Required function calls to register the header fields and subtrees used */
        proto_register_field_array(proto_bicc, hf, array_length(hf));

diff --git a/epan/dissectors/packet-s1ap.c b/epan/dissectors/packet-s1ap.c
index a316b7f2cb63f4f87345d664d4023776c88867ff..3302f65feaf77c6b6ed4080acf7feb5a6db4a1e9 100644 (file)
--- a/epan/dissectors/packet-s1ap.c
+++ b/epan/dissectors/packet-s1ap.c
@@ -60,7 +60,7 @@
 #pragma warning(disable:4146)
 #endif
 
-#define PNAME  "S1 Application Protocol "
+#define PNAME  "S1 Application Protocol"
 #define PSNAME "S1AP"
 #define PFNAME "s1ap"
 

diff --git a/epan/dissectors/packet-x224.c b/epan/dissectors/packet-x224.c
index da3e2aa5cdc65da625cbcb6ca25405999b6e8889..df0a5cafb27179948ff2adbc50482215594a9525 100644 (file)
--- a/epan/dissectors/packet-x224.c
+++ b/epan/dissectors/packet-x224.c
@@ -316,7 +316,7 @@ proto_register_x224(void)
                &ett_x224,
        };
 
-       proto_x224 = proto_register_protocol("ITU-T Rec X.224 ", "X.224", "x224");
+       proto_x224 = proto_register_protocol("ITU-T Rec X.224", "X.224", "x224");
        proto_register_field_array(proto_x224, hf, array_length(hf));
        proto_register_subtree_array(ett, array_length(ett));
        register_dissector("x224", dissect_x224, proto_x224);

diff --git a/plugins/docsis/packet-dccack.c b/plugins/docsis/packet-dccack.c
index 59ea3feeee374d7d79f0b5958a91c430b53c3106..e97b80697494183da9272b67847d470bbd36fb00 100644 (file)
--- a/plugins/docsis/packet-dccack.c
+++ b/plugins/docsis/packet-dccack.c
@@ -163,7 +163,7 @@ proto_register_docsis_dccack (void)
 
 /* Register the protocol name and description */
   proto_docsis_dccack =
-    proto_register_protocol ("DOCSIS Downstream Channel Change Acknowledge ",
+    proto_register_protocol ("DOCSIS Downstream Channel Change Acknowledge",
                             "DOCSIS DCC-ACK", "docsis_dccack");
 
 /* Required function calls to register the header fields and subtrees used */

diff --git a/plugins/docsis/packet-dccreq.c b/plugins/docsis/packet-dccreq.c
index 0ad6a895861b0d3cecaa23aba9292887c09bf328..de2197b8b3572fa51b3086add2b503614260c955 100644 (file)
--- a/plugins/docsis/packet-dccreq.c
+++ b/plugins/docsis/packet-dccreq.c
@@ -594,7 +594,7 @@ proto_register_docsis_dccreq (void)
 
 /* Register the protocol name and description */
   proto_docsis_dccreq =
-    proto_register_protocol ("DOCSIS Downstream Channel Change Request ",
+    proto_register_protocol ("DOCSIS Downstream Channel Change Request",
                             "DOCSIS DCC-REQ", "docsis_dccreq");
 
 /* Required function calls to register the header fields and subtrees used */

diff --git a/plugins/docsis/packet-dccrsp.c b/plugins/docsis/packet-dccrsp.c
index d1f1f523ed1cca5e9aa3683f33780ec2fe09c68d..ded61839c6c46ba05effa2dba157dd569362c063 100644 (file)
--- a/plugins/docsis/packet-dccrsp.c
+++ b/plugins/docsis/packet-dccrsp.c
@@ -251,7 +251,7 @@ proto_register_docsis_dccrsp (void)
 
 /* Register the protocol name and description */
   proto_docsis_dccrsp =
-    proto_register_protocol ("DOCSIS Downstream Channel Change Response ",
+    proto_register_protocol ("DOCSIS Downstream Channel Change Response",
                             "DOCSIS DCC-RSP", "docsis_dccrsp");
 
 /* Required function calls to register the header fields and subtrees used */

diff --git a/plugins/docsis/packet-dcd.c b/plugins/docsis/packet-dcd.c
index fb263c7602796f8edf1a9cd5aa80695ebdb9ad52..b18c14cc7f95dd4d60f8c35795bd02e74ff48cea 100644 (file)
--- a/plugins/docsis/packet-dcd.c
+++ b/plugins/docsis/packet-dcd.c
@@ -840,7 +840,7 @@ proto_register_docsis_dcd (void)
 
 /* Register the protocol name and description */
   proto_docsis_dcd =
-    proto_register_protocol ("DOCSIS Downstream Channel Descriptor ",
+    proto_register_protocol ("DOCSIS Downstream Channel Descriptor",
                             "DOCSIS DCD", "docsis_dcd");
 
 /* Required function calls to register the header fields and subtrees used */