Skip to content

Commit

Permalink
Fix warning: ISO C does not allow extra ';' outside of a function.
Browse files Browse the repository at this point in the history 
svn path=/trunk/; revision=50638
  • Loading branch information
@cjmaynard
cjmaynard committed Jul 15, 2013
1 parent 49051b1 commit f5f20fa
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 31 deletions.
20 changes: 10 additions & 10 deletions asn1/ess/packet-ess-template.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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_)
Expand Down Expand Up @@ -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]);

Expand All @@ -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]);

Expand All @@ -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"
Expand All @@ -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"),
Expand Down Expand Up @@ -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",
Expand Down
20 changes: 10 additions & 10 deletions epan/dissectors/packet-ess.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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_)
Expand Down Expand Up @@ -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]);

Expand All @@ -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]);

Expand Down Expand Up @@ -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 }},

Expand Down Expand Up @@ -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"),
Expand Down Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions epan/dissectors/packet-rtmpt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/

Expand Down Expand Up @@ -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
Expand Down
13 changes: 6 additions & 7 deletions epan/dissectors/packet-socks.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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) {
Expand Down
5 changes: 3 additions & 2 deletions plugins/profinet/packet-dcerpc-pn-io.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -6756,7 +6757,7 @@ static const char* decode_ARType_spezial(guint16 ARType, guint16 ARAccess)
}
else
return("reserved");
};
}

/* dissect the ARBlockReq */
static int
Expand Down

0 comments on commit f5f20fa

Please sign in to comment.