osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Remove not needed ';' 

svn path=/trunk/; revision=54088
This commit is contained in:
Jakub Zawadzki 2013-12-14 11:12:20 +00:00
parent fde0410bb5
commit 4d92f6079b
20 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asn1/ansi_map/packet-ansi_map-template.c
View File

@ -4230,7 +4230,7 @@ static int dissect_returnData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
offset = dissect_ansi_map_ModifyRes(TRUE, tvb, offset, actx, tree, hf_ansi_map_modifyRes); offset = dissect_ansi_map_ModifyRes(TRUE, tvb, offset, actx, tree, hf_ansi_map_modifyRes);
break; break;
case 72: /*Search*/ case 72: /*Search*/
offset = dissect_ansi_map_SearchRes(TRUE, tvb, offset, actx, tree, hf_ansi_map_searchRes);; offset = dissect_ansi_map_SearchRes(TRUE, tvb, offset, actx, tree, hf_ansi_map_searchRes);
break; break;
case 73: /*Seize Resource*/ case 73: /*Seize Resource*/
offset = dissect_ansi_map_SeizeResourceRes(TRUE, tvb, offset, actx, tree, hf_ansi_map_seizeResourceRes); offset = dissect_ansi_map_SeizeResourceRes(TRUE, tvb, offset, actx, tree, hf_ansi_map_seizeResourceRes);

2
echld_test.c
View File

@ -143,7 +143,7 @@ static char* new_child_cmd(char** params, char** err) {
return NULL; return NULL;
} }
return g_strdup_printf("New chld_id=%d\n",child);; return g_strdup_printf("New chld_id=%d\n",child);
} }

2
epan/dissectors/packet-ansi_map.c
View File

@ -16108,7 +16108,7 @@ static int dissect_returnData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
offset = dissect_ansi_map_ModifyRes(TRUE, tvb, offset, actx, tree, hf_ansi_map_modifyRes); offset = dissect_ansi_map_ModifyRes(TRUE, tvb, offset, actx, tree, hf_ansi_map_modifyRes);
break; break;
case 72: /*Search*/ case 72: /*Search*/
offset = dissect_ansi_map_SearchRes(TRUE, tvb, offset, actx, tree, hf_ansi_map_searchRes);; offset = dissect_ansi_map_SearchRes(TRUE, tvb, offset, actx, tree, hf_ansi_map_searchRes);
break; break;
case 73: /*Seize Resource*/ case 73: /*Seize Resource*/
offset = dissect_ansi_map_SeizeResourceRes(TRUE, tvb, offset, actx, tree, hf_ansi_map_seizeResourceRes); offset = dissect_ansi_map_SeizeResourceRes(TRUE, tvb, offset, actx, tree, hf_ansi_map_seizeResourceRes);

2
epan/dissectors/packet-aprs.c
View File

@ -1311,7 +1311,7 @@ dissect_aprs( tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *
sb = wmem_strbuf_new_label(wmem_packet_scope()); sb = wmem_strbuf_new_label(wmem_packet_scope());
if (dti != '!') if (dti != '!')
wmem_strbuf_append(sb, val_to_str_ext_const(dti, &aprs_description_ext, ""));; wmem_strbuf_append(sb, val_to_str_ext_const(dti, &aprs_description_ext, ""));
switch ( dti ) switch ( dti )
{ {

2
epan/dissectors/packet-btmcap.c
View File

@ -200,7 +200,7 @@ dissect_btmcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _
if (bluetooth_clock_sync_time == 0xFFFFFFFF) if (bluetooth_clock_sync_time == 0xFFFFFFFF)
proto_item_append_text(pitem, " (Instant Synchronization)"); proto_item_append_text(pitem, " (Instant Synchronization)");
else else
proto_item_append_text(pitem, " (Baseband Half-Slot Instant)");; proto_item_append_text(pitem, " (Baseband Half-Slot Instant)");
offset += 4; offset += 4;
pitem = proto_tree_add_item(main_tree, hf_btmcap_timestamp_sync_time, tvb, offset, 8, ENC_BIG_ENDIAN); pitem = proto_tree_add_item(main_tree, hf_btmcap_timestamp_sync_time, tvb, offset, 8, ENC_BIG_ENDIAN);

2
epan/dissectors/packet-btsdp.c
View File

@ -4220,7 +4220,7 @@ dissect_sdp_service_search_attribute_response(proto_tree *tree, tvbuff_t *tvb,
PDU_TYPE_SERVICE_SEARCH_ATTRIBUTE, &new_tvb, &is_first, PDU_TYPE_SERVICE_SEARCH_ATTRIBUTE, &new_tvb, &is_first,
&is_continued, &uuid_array, NULL, l2cap_data); &is_continued, &uuid_array, NULL, l2cap_data);
uuid = get_most_specified_uuid(uuid_array);; uuid = get_most_specified_uuid(uuid_array);
if (is_first && !is_continued) { if (is_first && !is_continued) {
dissect_sdp_service_attribute_list_array(tree, tvb, offset, pinfo, dissect_sdp_service_attribute_list_array(tree, tvb, offset, pinfo,

2
epan/dissectors/packet-dns.c
View File

@ -3285,7 +3285,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
} }
proto_tree_add_item(rr_tree, hf_dns_tkey_other_size, tvb, cur_offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(rr_tree, hf_dns_tkey_other_size, tvb, cur_offset, 2, ENC_BIG_ENDIAN);
tkey_otherlen = tvb_get_ntohs(tvb, cur_offset);; tkey_otherlen = tvb_get_ntohs(tvb, cur_offset);
cur_offset += 2; cur_offset += 2;
if (tkey_otherlen != 0) { if (tkey_otherlen != 0) {

4
epan/dissectors/packet-isup.c
View File

@ -7921,7 +7921,7 @@ dissect_japan_isup_charge_area_info(tvbuff_t *parameter_tvb, proto_tree *paramet
ca_number[digit_index++] = number_to_char((octet & ISUP_EVEN_ADDRESS_SIGNAL_DIGIT_MASK) / 0x10); ca_number[digit_index++] = number_to_char((octet & ISUP_EVEN_ADDRESS_SIGNAL_DIGIT_MASK) / 0x10);
} }
offset += 1; offset += 1;
length -= 1;; length -= 1;
} }
ca_number[digit_index++] = '\0'; ca_number[digit_index++] = '\0';
proto_item_set_text(digits_item, "Charge Area : %s", ca_number); proto_item_set_text(digits_item, "Charge Area : %s", ca_number);
@ -7957,7 +7957,7 @@ dissect_japan_isup_charge_area_info(tvbuff_t *parameter_tvb, proto_tree *paramet
proto_tree_add_uint(digits_tree, hf_isup_charging_info_maca_even_digits, parameter_tvb, 0, 1, octet); proto_tree_add_uint(digits_tree, hf_isup_charging_info_maca_even_digits, parameter_tvb, 0, 1, octet);
} }
offset += 1; offset += 1;
length -= 1;; length -= 1;
} }
} }

2
epan/dissectors/packet-mbim.c
View File

@ -2230,7 +2230,7 @@ mbim_dissect_context(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint o
{ {
gint base_offset; gint base_offset;
guint32 access_string_offset, access_string_size, user_name_offset, user_name_size, guint32 access_string_offset, access_string_size, user_name_offset, user_name_size,
password_offset, password_size, provider_id_offset = 0, provider_id_size = 0;; password_offset, password_size, provider_id_offset = 0, provider_id_size = 0;
base_offset = offset; base_offset = offset;
proto_tree_add_item(tree, hf_mbim_context_context_id, tvb, offset, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_mbim_context_context_id, tvb, offset, 4, ENC_LITTLE_ENDIAN);

6
epan/dissectors/packet-mq-base.c
View File

@ -39,7 +39,7 @@ guint64 tvb_get_guint64_endian(tvbuff_t *a_tvb, gint a_iOffset, gint a_rep)
else else
iResult = tvb_get_ntoh64(a_tvb, a_iOffset); iResult = tvb_get_ntoh64(a_tvb, a_iOffset);
return iResult; return iResult;
}; }
guint32 tvb_get_guint32_endian(tvbuff_t *a_tvb, gint a_iOffset, gint a_rep) guint32 tvb_get_guint32_endian(tvbuff_t *a_tvb, gint a_iOffset, gint a_rep)
{ {
guint32 iResult; guint32 iResult;
@ -48,7 +48,7 @@ guint32 tvb_get_guint32_endian(tvbuff_t *a_tvb, gint a_iOffset, gint a_rep)
else else
iResult = tvb_get_ntohl(a_tvb, a_iOffset); iResult = tvb_get_ntohl(a_tvb, a_iOffset);
return iResult; return iResult;
}; }
guint16 tvb_get_guint16_endian(tvbuff_t *a_tvb, gint a_iOffset, gint a_rep) guint16 tvb_get_guint16_endian(tvbuff_t *a_tvb, gint a_iOffset, gint a_rep)
{ {
guint16 sResult; guint16 sResult;
@ -57,7 +57,7 @@ guint16 tvb_get_guint16_endian(tvbuff_t *a_tvb, gint a_iOffset, gint a_rep)
else else
sResult = tvb_get_ntohs(a_tvb, a_iOffset); sResult = tvb_get_ntohs(a_tvb, a_iOffset);
return sResult; return sResult;
}; }
/* This routine truncates the string at the first blank space */ /* This routine truncates the string at the first blank space */
gint32 strip_trailing_blanks(guint8* a_str, guint32 a_size) gint32 strip_trailing_blanks(guint8* a_str, guint32 a_size)
{ {

2
epan/dissectors/packet-ncp2222.inc
View File

@ -8462,7 +8462,7 @@ dissect_nds_reply(tvbuff_t *tvb, packet_info *pinfo,
pvalues[1].mvtype = 0; pvalues[1].mvtype = 0;
pvalues[1].hfname= hf_nds_class_def_type; pvalues[1].hfname= hf_nds_class_def_type;
nds_offset = nds_offset + pvalues[1].vlength; nds_offset = nds_offset + pvalues[1].vlength;
pvalues[2].vvalue = tvb_get_letohl(tvb, nds_offset);; pvalues[2].vvalue = tvb_get_letohl(tvb, nds_offset);
pvalues[2].vtype = VTYPE_MULTIVALUE_UINT32; pvalues[2].vtype = VTYPE_MULTIVALUE_UINT32;
pvalues[2].vdesc = "Class Definitions %u"; pvalues[2].vdesc = "Class Definitions %u";
pvalues[2].vlength = 0; pvalues[2].vlength = 0;

2
epan/dissectors/packet-noe.c
View File

@ -1301,7 +1301,7 @@ static void dissect_noe(tvbuff_t *tvb,
1, 1,
server); server);
offset += 1; offset += 1;
length -= 1;; length -= 1;
/* update text of the main proto item */ /* update text of the main proto item */
proto_item_append_text(noe_item, ", %s", proto_item_append_text(noe_item, ", %s",

6
epan/dissectors/packet-openflow_v4.c
View File

@ -2331,7 +2331,7 @@ dissect_openflow_port_v4(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree
offset+=4; offset+=4;
return offset; return offset;
}; }
@ -3404,7 +3404,7 @@ dissect_openflow_switch_description_v4(tvbuff_t *tvb, packet_info *pinfo _U_, pr
/* char dp_desc[DESC_STR_LEN]; */ /* char dp_desc[DESC_STR_LEN]; */
proto_tree_add_item(tree, hf_openflow_v4_switch_description_dp_desc, tvb, offset, DESC_STR_LEN, ENC_ASCII|ENC_NA); proto_tree_add_item(tree, hf_openflow_v4_switch_description_dp_desc, tvb, offset, DESC_STR_LEN, ENC_ASCII|ENC_NA);
/*offset+=DESC_STR_LEN;*/ /*offset+=DESC_STR_LEN;*/
}; }
static int static int
@ -3628,7 +3628,7 @@ dissect_openflow_port_stats_v4(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
offset+=4; offset+=4;
return offset; return offset;
}; }
static int static int

6
epan/dissectors/packet-openflow_v5.c
View File

@ -2450,7 +2450,7 @@ dissect_openflow_port_v5(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree
return offset; return offset;
#endif #endif
}; }
@ -3553,7 +3553,7 @@ dissect_openflow_switch_description_v5(tvbuff_t *tvb, packet_info *pinfo _U_, pr
/* char dp_desc[DESC_STR_LEN]; */ /* char dp_desc[DESC_STR_LEN]; */
proto_tree_add_item(tree, hf_openflow_v5_switch_description_dp_desc, tvb, offset, DESC_STR_LEN, ENC_ASCII|ENC_NA); proto_tree_add_item(tree, hf_openflow_v5_switch_description_dp_desc, tvb, offset, DESC_STR_LEN, ENC_ASCII|ENC_NA);
/*offset+=DESC_STR_LEN;*/ /*offset+=DESC_STR_LEN;*/
}; }
static int static int
@ -3781,7 +3781,7 @@ dissect_openflow_port_stats_v5(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
offset+=4; offset+=4;
return offset; return offset;
}; }
static int static int

2
epan/dissectors/packet-rsvp.c
View File

@ -6483,7 +6483,7 @@ dissect_rsvp_3gpp_object(proto_tree *ti _U_, proto_tree *rsvp_object_tree,
offset++; offset++;
/* [RFC 3006] hint */ /* [RFC 3006] hint */
proto_tree_add_item(flow_tree, hf_rsvp_3gpp_obj_pf_hint, tvb, offset, 4, ENC_BIG_ENDIAN); proto_tree_add_item(flow_tree, hf_rsvp_3gpp_obj_pf_hint, tvb, offset, 4, ENC_BIG_ENDIAN);
offset+=4;; offset+=4;
} }
proto_item_set_len(ti, item_len); proto_item_set_len(ti, item_len);
} }

2
epan/dissectors/packet-rtp.c
View File

@ -1924,7 +1924,7 @@ dissect_rtp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
call_dissector(data_handle, call_dissector(data_handle,
tvb_new_subset_remaining(tvb, offset), tvb_new_subset_remaining(tvb, offset),
pinfo, rtp_tree); pinfo, rtp_tree);
return tvb_length(tvb);; return tvb_length(tvb);
} }
padding_count = tvb_get_guint8( tvb, padding_count = tvb_get_guint8( tvb,

2
epan/dissectors/packet-sdp.c
View File

@ -1355,7 +1355,7 @@ static void dissect_sdp_media_attribute(tvbuff_t *tvb, packet_info *pinfo, proto
port_end_offset = tvb_find_guint8(tvb, port_offset, -1, '/'); port_end_offset = tvb_find_guint8(tvb, port_offset, -1, '/');
if (port_end_offset == -1) { if (port_end_offset == -1) {
/* No "/" look for the ";" */ /* No "/" look for the ";" */
port_end_offset = tvb_find_guint8(tvb, port_offset, -1, ';');; port_end_offset = tvb_find_guint8(tvb, port_offset, -1, ';');
} }
/* Attempt to convert address */ /* Attempt to convert address */
if (inet_pton(AF_INET, if (inet_pton(AF_INET,

2
plugins/profinet/packet-pn-ptcp.c
View File

@ -443,7 +443,7 @@ dissect_PNPTCP_Option_PROFINET(tvbuff_t *tvb, int offset,
/* SubType */ /* SubType */
offset = dissect_pn_uint8(tvb, offset, pinfo, tree, hf_pn_ptcp_profinet_subtype, &subType); offset = dissect_pn_uint8(tvb, offset, pinfo, tree, hf_pn_ptcp_profinet_subtype, &subType);
length -= 1;; length -= 1;
switch (subType) { switch (subType) {
case 1: /* RTData */ case 1: /* RTData */

2
ui/qt/main_window_slots.cpp
View File

@ -732,7 +732,7 @@ void MainWindow::setMenusForSelectedPacket()
#if 0 #if 0
gboolean is_ip = FALSE, is_tcp = FALSE, is_udp = FALSE, is_sctp = FALSE; gboolean is_ip = FALSE, is_tcp = FALSE, is_udp = FALSE, is_sctp = FALSE;
#else #else
gboolean is_tcp = FALSE, is_sctp = FALSE;; gboolean is_tcp = FALSE, is_sctp = FALSE;
#endif #endif
// /* Making the menu context-sensitive allows for easier selection of the // /* Making the menu context-sensitive allows for easier selection of the

2
ui/qt/wireshark_application.cpp
View File

@ -535,7 +535,7 @@ void WiresharkApplication::cleanup()
void WiresharkApplication::itemStatusFinished(const QString &filename, qint64 size, bool accessible) { void WiresharkApplication::itemStatusFinished(const QString &filename, qint64 size, bool accessible) {
recent_item_status *ri; recent_item_status *ri;
RecentFileStatus *rf_status = qobject_cast<RecentFileStatus *>(QObject::sender());; RecentFileStatus *rf_status = qobject_cast<RecentFileStatus *>(QObject::sender());
// g_log(NULL, G_LOG_LEVEL_DEBUG, "rf isf %d", recent_items.count()); // g_log(NULL, G_LOG_LEVEL_DEBUG, "rf isf %d", recent_items.count());
foreach (ri, recent_items) { foreach (ri, recent_items) {