Fix warning: ISO C does not allow extra ';' outside of a function.

svn path=/trunk/; revision=50638

5 files changed, 31 insertions, 31 deletions

diff --git a/asn1/ess/packet-ess-template.c b/asn1/ess/packet-ess-template.c
index 424038405a..b173dd4cb9 100644
--- a/asn1/ess/packet-ess-template.c
+++ b/asn1/ess/packet-ess-template.c
@@ -69,9 +69,9 @@ static gint ett_Category_attributes = -1;
 
 static const char *object_identifier_id;
 
-UAT_CSTRING_CB_DEF(ess_category_attributes, oid, ess_category_attributes_t);
-UAT_DEC_CB_DEF(ess_category_attributes, lacv, ess_category_attributes_t);
-UAT_CSTRING_CB_DEF(ess_category_attributes, name, ess_category_attributes_t);
+UAT_CSTRING_CB_DEF(ess_category_attributes, oid, ess_category_attributes_t)
+UAT_DEC_CB_DEF(ess_category_attributes, lacv, ess_category_attributes_t)
+UAT_CSTRING_CB_DEF(ess_category_attributes, name, ess_category_attributes_t)
 
 static void *
 ess_copy_cb(void *dest, const void *orig, size_t len _U_)
@@ -99,7 +99,7 @@ static void
 ess_dissect_attribute (guint32 value, asn1_ctx_t *actx)
 {
   guint i;
-   
+
   for (i = 0; i < num_ess_category_attributes; i++) {
     ess_category_attributes_t *u = &(ess_category_attributes[i]);
 
@@ -118,10 +118,10 @@ ess_dissect_attribute_flags (tvbuff_t *tvb, asn1_ctx_t *actx)
   proto_tree *tree;
   guint8 *value;
   guint i;
-   
+
   tree = proto_item_add_subtree (actx->created_item, ett_Category_attributes);
   value = tvb_get_ephemeral_string (tvb, 0, tvb_length (tvb));
-  
+
   for (i = 0; i < num_ess_category_attributes; i++) {
     ess_category_attributes_t *u = &(ess_category_attributes[i]);
 
@@ -143,10 +143,10 @@ void proto_register_ess(void) {
 
   /* List of fields */
   static hf_register_info hf[] = {
-    { &hf_ess_SecurityCategory_type_OID, 
+    { &hf_ess_SecurityCategory_type_OID,
       { "type", "ess.type_OID", FT_STRING, BASE_NONE, NULL, 0,
 	"Type of Security Category", HFILL }},
-    { &hf_ess_Category_attribute, 
+    { &hf_ess_Category_attribute,
       { "Attribute", "ess.attribute", FT_STRING, BASE_NONE, NULL, 0,
 	NULL, HFILL }},
 #include "packet-ess-hfarr.c"
@@ -157,7 +157,7 @@ void proto_register_ess(void) {
      &ett_Category_attributes,
 #include "packet-ess-ettarr.c"
   };
-  
+
   static uat_field_t attributes_flds[] = {
     UAT_FLD_CSTRING(ess_category_attributes,oid, "Tag Set", "Category Tag Set (Object Identifier)"),
     UAT_FLD_DEC(ess_category_attributes,lacv, "Value", "Label And Cert Value"),
@@ -187,7 +187,7 @@ void proto_register_ess(void) {
   /* Register fields and subtrees */
   proto_register_field_array(proto_ess, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
-  
+
   ess_module = prefs_register_protocol(proto_ess, NULL);
 
   prefs_register_uat_preference(ess_module, "attributes_table",
diff --git a/epan/dissectors/packet-ess.c b/epan/dissectors/packet-ess.c
index f5e56bf5c0..299a2612c4 100644
--- a/epan/dissectors/packet-ess.c
+++ b/epan/dissectors/packet-ess.c
@@ -210,9 +210,9 @@ static gint ett_ess_IssuerSerial = -1;
 
 static const char *object_identifier_id;
 
-UAT_CSTRING_CB_DEF(ess_category_attributes, oid, ess_category_attributes_t);
-UAT_DEC_CB_DEF(ess_category_attributes, lacv, ess_category_attributes_t);
-UAT_CSTRING_CB_DEF(ess_category_attributes, name, ess_category_attributes_t);
+UAT_CSTRING_CB_DEF(ess_category_attributes, oid, ess_category_attributes_t)
+UAT_DEC_CB_DEF(ess_category_attributes, lacv, ess_category_attributes_t)
+UAT_CSTRING_CB_DEF(ess_category_attributes, name, ess_category_attributes_t)
 
 static void *
 ess_copy_cb(void *dest, const void *orig, size_t len _U_)
@@ -240,7 +240,7 @@ static void
 ess_dissect_attribute (guint32 value, asn1_ctx_t *actx)
 {
   guint i;
-   
+
   for (i = 0; i < num_ess_category_attributes; i++) {
     ess_category_attributes_t *u = &(ess_category_attributes[i]);
 
@@ -259,10 +259,10 @@ ess_dissect_attribute_flags (tvbuff_t *tvb, asn1_ctx_t *actx)
   proto_tree *tree;
   guint8 *value;
   guint i;
-   
+
   tree = proto_item_add_subtree (actx->created_item, ett_Category_attributes);
   value = tvb_get_ephemeral_string (tvb, 0, tvb_length (tvb));
-  
+
   for (i = 0; i < num_ess_category_attributes; i++) {
     ess_category_attributes_t *u = &(ess_category_attributes[i]);
 
@@ -1131,10 +1131,10 @@ void proto_register_ess(void) {
 
   /* List of fields */
   static hf_register_info hf[] = {
-    { &hf_ess_SecurityCategory_type_OID, 
+    { &hf_ess_SecurityCategory_type_OID,
       { "type", "ess.type_OID", FT_STRING, BASE_NONE, NULL, 0,
 	"Type of Security Category", HFILL }},
-    { &hf_ess_Category_attribute, 
+    { &hf_ess_Category_attribute,
       { "Attribute", "ess.attribute", FT_STRING, BASE_NONE, NULL, 0,
 	NULL, HFILL }},
 
@@ -1466,7 +1466,7 @@ void proto_register_ess(void) {
 /*--- End of included file: packet-ess-ettarr.c ---*/
 #line 159 "../../asn1/ess/packet-ess-template.c"
   };
-  
+
   static uat_field_t attributes_flds[] = {
     UAT_FLD_CSTRING(ess_category_attributes,oid, "Tag Set", "Category Tag Set (Object Identifier)"),
     UAT_FLD_DEC(ess_category_attributes,lacv, "Value", "Label And Cert Value"),
@@ -1496,7 +1496,7 @@ void proto_register_ess(void) {
   /* Register fields and subtrees */
   proto_register_field_array(proto_ess, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
-  
+
   ess_module = prefs_register_protocol(proto_ess, NULL);
 
   prefs_register_uat_preference(ess_module, "attributes_table",
diff --git a/epan/dissectors/packet-rtmpt.c b/epan/dissectors/packet-rtmpt.c
index db1a91368a..fbe6a54340 100644
--- a/epan/dissectors/packet-rtmpt.c
+++ b/epan/dissectors/packet-rtmpt.c
@@ -60,7 +60,7 @@
 *          http://amf3cplusplus.googlecode.com/svn-history/r4/trunk/doc/amf3_spec_05_05_08.pdf
 *
 *   for AMF3.
-*      
+*
 *   Default TCP port is 1935
 */
 
@@ -2887,7 +2887,7 @@ proto_register_amf(void)
         proto_amf = proto_register_protocol("Action Message Format", "AMF", "amf");
         proto_register_field_array(proto_amf, hf, array_length(hf));
         proto_register_subtree_array(ett, array_length(ett));
-};
+}
 
 /*
  * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
diff --git a/epan/dissectors/packet-socks.c b/epan/dissectors/packet-socks.c
index 2849ce66ac..dbc37c0b4b 100644
--- a/epan/dissectors/packet-socks.c
+++ b/epan/dissectors/packet-socks.c
@@ -399,8 +399,7 @@ save_client_state(packet_info *pinfo, enum ClientState state)
 	if ((state_info != NULL) && (state_info->client == clientNoInit)) {
 		state_info->client = state;
 	}
-
-};
+}
 
 static void
 save_server_state(packet_info *pinfo, enum ServerState state)
@@ -539,7 +538,7 @@ client_display_socks_v5(tvbuff_t *tvb, int offset, packet_info *pinfo,
 			(tvb_get_guint8(tvb, offset + 2) == 0) &&
 			(tvb_reported_length_remaining(tvb, offset + 2 + num_auth_methods) > 0)) {
 				new_state_info.client = clientV5Command;
-				client_display_socks_v5(tvb, offset, pinfo, tree, hash_info, &new_state_info); 
+				client_display_socks_v5(tvb, offset, pinfo, tree, hash_info, &new_state_info);
 		}
 	}
 	else if (state_info->client == clientV5Command) {
@@ -695,7 +694,7 @@ state_machine_v4( socks_hash_entry_t *hash_info, tvbuff_t *tvb,
 		/* get remote port */
 		if ( hash_info->command == CONNECT_COMMAND)
 			hash_info->port =  tvb_get_ntohs(tvb, offset + 2);
-		
+
 		/* get remote address */
 		TVB_SET_ADDRESS(&addr, AT_IPv4, tvb, offset, 4);
 		SE_COPY_ADDRESS(&hash_info->dst_addr, &addr);
@@ -737,7 +736,7 @@ client_state_machine_v5( socks_hash_entry_t *hash_info, tvbuff_t *tvb,
 			/* No authentication needed */
 			hash_info->clientState = clientV5Command;
 			if (tvb_reported_length_remaining(tvb, offset + 2 + num_auth_methods) > 0) {
-				client_state_machine_v5(hash_info, tvb, offset + 2 + num_auth_methods, pinfo, FALSE); 
+				client_state_machine_v5(hash_info, tvb, offset + 2 + num_auth_methods, pinfo, FALSE);
 			}
 		} else {
 			hash_info->clientState = clientWaitForAuthReply;
@@ -849,7 +848,7 @@ server_state_machine_v5( socks_hash_entry_t *hash_info, tvbuff_t *tvb,
 			if ((tvb_get_guint8(tvb, offset + 2) == 0) &&
 				(tvb_reported_length_remaining(tvb, offset) > 5)) {
 					offset = display_address(tvb, offset, NULL);
-					client_state_machine_v5(hash_info, tvb, offset, pinfo, FALSE); 
+					client_state_machine_v5(hash_info, tvb, offset, pinfo, FALSE);
 			}
 			break;
 
@@ -1058,7 +1057,7 @@ dissect_socks(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U
 
 	/* run state machine if needed */
 	if ((!pinfo->fd->flags.visited) &&
-		(!((hash_info->clientState == clientDone) && 
+		(!((hash_info->clientState == clientDone) &&
 		   (hash_info->serverState == serverDone)))) {
 
 		if (hash_info->server_port == pinfo->destport) {
diff --git a/plugins/profinet/packet-dcerpc-pn-io.c b/plugins/profinet/packet-dcerpc-pn-io.c
index 4dc193944b..4d354591b9 100644
--- a/plugins/profinet/packet-dcerpc-pn-io.c
+++ b/plugins/profinet/packet-dcerpc-pn-io.c
@@ -6737,7 +6737,8 @@ dissect_ARFSUDataAdjust_block(tvbuff_t *tvb, int offset,
     return offset;
 }
 
-static const char* decode_ARType_spezial(guint16 ARType, guint16 ARAccess)
+static const char *
+decode_ARType_spezial(guint16 ARType, guint16 ARAccess)
 {
     if (ARType == 0x0001)
         return ("IO Controller AR");
@@ -6756,7 +6757,7 @@ static const char* decode_ARType_spezial(guint16 ARType, guint16 ARAccess)
     }
     else
         return("reserved");
-};
+}
 
 /* dissect the ARBlockReq */
 static int