diff options
38 files changed, 54 insertions, 55 deletions
diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c index b117378f18..46124cb39a 100644 --- a/epan/dissectors/packet-afp.c +++ b/epan/dissectors/packet-afp.c @@ -4612,7 +4612,7 @@ dissect_reply_afp_spotlight(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t proto_tree_add_item(tree, hf_afp_spotlight_returncode, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - tvb_get_ephemeral_stringz(tvb, offset, &len);; + tvb_get_ephemeral_stringz(tvb, offset, &len); proto_tree_add_item(tree, hf_afp_spotlight_volpath_server, tvb, offset, len, ENC_UTF_8|ENC_NA); offset += len; break; diff --git a/epan/dissectors/packet-ansi_637.c b/epan/dissectors/packet-ansi_637.c index 1e40510004..8876a28c8c 100644 --- a/epan/dissectors/packet-ansi_637.c +++ b/epan/dissectors/packet-ansi_637.c @@ -726,7 +726,7 @@ tele_param_user_data(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) for (i=0; i < num_fields; i++) { oct = tvb_get_guint8(tvb, saved_offset); - oct2 = tvb_get_guint8(tvb, saved_offset + 1);; + oct2 = tvb_get_guint8(tvb, saved_offset + 1); ansi_637_bigbuf[i] = ((oct & 0x07) << 5) | ((oct2 & 0xf8) >> 3); saved_offset++; } @@ -753,7 +753,7 @@ tele_param_user_data(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset) for (i=0; i < num_fields; i++) { oct = tvb_get_guint8(tvb, saved_offset); - oct2 = tvb_get_guint8(tvb, saved_offset + 1);; + oct2 = tvb_get_guint8(tvb, saved_offset + 1); ansi_637_bigbuf[i] = ((oct & 0x07) << 5) | ((oct2 & 0xf8) >> 3); saved_offset++; } diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c index 095ae2a778..c732ad59e9 100644 --- a/epan/dissectors/packet-bacapp.c +++ b/epan/dissectors/packet-bacapp.c @@ -8596,7 +8596,7 @@ fVtDataRequest (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint offse { offset= fApplicationTypes (tvb, pinfo, tree,offset,"VT Session ID: "); offset = fApplicationTypes (tvb, pinfo, tree, offset, "VT New Data: "); - return fApplicationTypes (tvb, pinfo, tree,offset,"VT Data Flag: ");; + return fApplicationTypes (tvb, pinfo, tree,offset,"VT Data Flag: "); } static guint diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c index 829f150612..4607d38a30 100644 --- a/epan/dissectors/packet-ber.c +++ b/epan/dissectors/packet-ber.c @@ -252,9 +252,9 @@ typedef struct _oid_user_t { char *syntax; } oid_user_t; -UAT_CSTRING_CB_DEF(oid_users, oid, oid_user_t); -UAT_CSTRING_CB_DEF(oid_users, name, oid_user_t); -UAT_VS_CSTRING_DEF(oid_users, syntax, oid_user_t, 0, ""); +UAT_CSTRING_CB_DEF(oid_users, oid, oid_user_t) +UAT_CSTRING_CB_DEF(oid_users, name, oid_user_t) +UAT_VS_CSTRING_DEF(oid_users, syntax, oid_user_t, 0, "") static oid_user_t *oid_users; static guint num_oid_users; diff --git a/epan/dissectors/packet-bgp.h b/epan/dissectors/packet-bgp.h index 586c21113c..c46ff0ec24 100644 --- a/epan/dissectors/packet-bgp.h +++ b/epan/dissectors/packet-bgp.h @@ -45,7 +45,6 @@ #define BGP_CAPABILITY 6 #define BGP_ROUTE_REFRESH_CISCO 0x80 -; /* BGP ROUTE-REFRESH message */ struct bgp_route_refresh { diff --git a/epan/dissectors/packet-cigi.c b/epan/dissectors/packet-cigi.c index 84975301e6..44a72011bf 100644 --- a/epan/dissectors/packet-cigi.c +++ b/epan/dissectors/packet-cigi.c @@ -5411,7 +5411,7 @@ cigi3_add_environmental_conditions_request(tvbuff_t *tvb, proto_tree *tree, gint offset++; proto_tree_add_item(tree, hf_cigi3_environmental_conditions_request_id, tvb, offset, 1, cigi_byte_order); - offset += 5;; + offset += 5; proto_tree_add_item(tree, hf_cigi3_environmental_conditions_request_lat, tvb, offset, 8, cigi_byte_order); offset += 8; @@ -5591,7 +5591,7 @@ cigi3_3_add_symbol_line_definition(tvbuff_t *tvb, proto_tree *tree, gint offset) proto_tree_add_item(tree, hf_cigi3_3_symbol_line_definition_stipple_pattern, tvb, offset, 2, cigi_byte_order); offset += 2; - proto_tree_add_item(tree, hf_cigi3_3_symbol_line_definition_line_width, tvb, offset, 4, cigi_byte_order);; + proto_tree_add_item(tree, hf_cigi3_3_symbol_line_definition_line_width, tvb, offset, 4, cigi_byte_order); offset += 4; proto_tree_add_item(tree, hf_cigi3_3_symbol_line_definition_stipple_pattern_length, tvb, offset, 4, cigi_byte_order); diff --git a/epan/dissectors/packet-dccp.c b/epan/dissectors/packet-dccp.c index 07460b5f96..ed978642b7 100644 --- a/epan/dissectors/packet-dccp.c +++ b/epan/dissectors/packet-dccp.c @@ -814,7 +814,7 @@ dissect_dccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else { hidden_item = proto_tree_add_boolean(dccp_tree, hf_dccp_checksum_bad, - tvb, offset + 6, 2, TRUE);; + tvb, offset + 6, 2, TRUE); PROTO_ITEM_SET_HIDDEN(hidden_item); proto_tree_add_uint_format_value( dccp_tree, hf_dccp_checksum, tvb, offset + 6, 2, diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c index a74eb31032..6485f69aba 100644 --- a/epan/dissectors/packet-dmp.c +++ b/epan/dissectors/packet-dmp.c @@ -1003,9 +1003,9 @@ static const value_string thales_ipm_id_modifier[] = { { 0, NULL } }; -UAT_VS_DEF(dmp_security_class, nation, dmp_security_class_t, 0, "None"); -UAT_DEC_CB_DEF(dmp_security_class, sec_class, dmp_security_class_t); -UAT_CSTRING_CB_DEF(dmp_security_class, name, dmp_security_class_t); +UAT_VS_DEF(dmp_security_class, nation, dmp_security_class_t, 0, "None") +UAT_DEC_CB_DEF(dmp_security_class, sec_class, dmp_security_class_t) +UAT_CSTRING_CB_DEF(dmp_security_class, name, dmp_security_class_t) static void * dmp_class_copy_cb(void *dest, const void *orig, size_t len _U_) diff --git a/epan/dissectors/packet-gmr1_bcch.c b/epan/dissectors/packet-gmr1_bcch.c index 3de2a4d374..4896acb5cf 100644 --- a/epan/dissectors/packet-gmr1_bcch.c +++ b/epan/dissectors/packet-gmr1_bcch.c @@ -855,7 +855,7 @@ CSN_DESCR_BEGIN(SI1_Block_Header_t) M_UINT (SI1_Block_Header_t, Block_Type, 1, &hf_si_block_type), M_UINT (SI1_Block_Header_t, Randomization_Period, 2, &hf_si1_randomization_period), M_UINT (SI1_Block_Header_t, Spare, 1, &hf_si_spare), -CSN_DESCR_END (SI1_Block_Header_t); +CSN_DESCR_END (SI1_Block_Header_t) static const CSN_ChoiceElement_t SI1_SegmentChoice[] = @@ -899,7 +899,7 @@ CSN_DESCR_BEGIN(SI2_Block_Header_t) M_UINT (SI2_Block_Header_t, Protocol_Version, 4, &hf_si_protocol_version), M_UINT (SI2_Block_Header_t, Block_Type, 1, &hf_si_block_type), M_UINT (SI2_Block_Header_t, Spare, 3, &hf_si_spare), -CSN_DESCR_END (SI2_Block_Header_t); +CSN_DESCR_END (SI2_Block_Header_t) static const CSN_ChoiceElement_t SI2_SegmentChoice[] = diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c index a0452c8436..ff3cada45a 100644 --- a/epan/dissectors/packet-gtpv2.c +++ b/epan/dissectors/packet-gtpv2.c @@ -4044,7 +4044,7 @@ dissect_gtpv2_source_ident(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* The Source Type is Cell ID for PS handover from GERAN A/Gb mode. In this case the coding of the Source ID field * shall be same as the Octets 3 to 10 of the Cell Identifier IEI in 3GPP TS 48.018 [34]. */ - de_cell_id(tvb, tree, pinfo, offset, 8, NULL, 0);; + de_cell_id(tvb, tree, pinfo, offset, 8, NULL, 0); break; case 1: /* The Source Type is RNC ID for PS handover from GERAN Iu mode or for inter-RAT handover from UTRAN. In this diff --git a/epan/dissectors/packet-hip.c b/epan/dissectors/packet-hip.c index 35b26ab8d8..a450bb9bf9 100644 --- a/epan/dissectors/packet-hip.c +++ b/epan/dissectors/packet-hip.c @@ -1041,7 +1041,7 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len } else if (type == PARAM_REG_FAILED) { /* Failure Type */ proto_tree_add_item(t, hf_hip_tlv_reg_failtype, tvb, newoffset, 1, ENC_BIG_ENDIAN); - newoffset++;; + newoffset++; tlv_len--; } else { /* Lifetime */ diff --git a/epan/dissectors/packet-icq.c b/epan/dissectors/packet-icq.c index 2df6a5f34f..e1c6653f34 100644 --- a/epan/dissectors/packet-icq.c +++ b/epan/dissectors/packet-icq.c @@ -1249,7 +1249,7 @@ icqv5_srv_meta_user(proto_tree* tree, /* Tree to put the data in */ auth = tvb_get_guint8(tvb, offset); proto_tree_add_text(sstree, tvb, offset, 1, "authorization: %s", (auth==0x01)?"Necessary":"Who needs it"); - offset++;; + offset++; /* Get x2 */ proto_tree_add_text(sstree, tvb, offset, sizeof(guint16), "x2: 0x%04x", tvb_get_letohs(tvb, offset)); diff --git a/epan/dissectors/packet-ieee17221.c b/epan/dissectors/packet-ieee17221.c index 3b774c42ed..961daa92b0 100644 --- a/epan/dissectors/packet-ieee17221.c +++ b/epan/dissectors/packet-ieee17221.c @@ -2534,7 +2534,7 @@ dissect_17221_aem(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) mr_item = proto_tree_add_item(aem_tree, hf_aem_sample_rates, tvb, 0, 0, ENC_NA); mr_counter = tvb_get_ntohs(tvb, AUDIO_UNIT_OFFSET_SAMPLE_RATES_COUNT); - mr_subtree = proto_item_add_subtree(mr_item, ett_aem_sample_rates);; + mr_subtree = proto_item_add_subtree(mr_item, ett_aem_sample_rates); mr_offset = AUDIO_UNIT_OFFSET_SAMPLE_RATES; proto_item_set_len(mr_item, 4 * mr_counter); /* loop to get the array values */ diff --git a/epan/dissectors/packet-igmp.c b/epan/dissectors/packet-igmp.c index 4442ed5c0b..54cb80a665 100644 --- a/epan/dissectors/packet-igmp.c +++ b/epan/dissectors/packet-igmp.c @@ -517,7 +517,7 @@ dissect_v3_group_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr col_append_fstr(pinfo->cinfo, COL_INFO, " / Group %s, unknown record type (?)", ip_to_str((guint8*)&maddr)); - break;; + break; } } else { switch(record_type) { diff --git a/epan/dissectors/packet-itdm.c b/epan/dissectors/packet-itdm.c index fd2f9c0bcd..5b755fabad 100644 --- a/epan/dissectors/packet-itdm.c +++ b/epan/dissectors/packet-itdm.c @@ -476,7 +476,7 @@ proto_reg_handoff_itdm(void) static guint ItdmMPLSLabel; if (!Initialized) { - itdm_handle = find_dissector("itdm");; + itdm_handle = find_dissector("itdm"); data_handle = find_dissector("data"); Initialized=TRUE; } else { diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c index 240ed1d717..3c7dc64394 100644 --- a/epan/dissectors/packet-nfs.c +++ b/epan/dissectors/packet-nfs.c @@ -2306,7 +2306,7 @@ dissect_fhandle_data_CELERRA(tvbuff_t* tvb, packet_info *pinfo _U_, proto_tree * proto_tree_add_uint(obj_tree, hf_nfs_fh_obj_gen, tvb, offset+36, 4, obj_gen); } } -}; +} static void dissect_fhandle_data_unknown(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) diff --git a/epan/dissectors/packet-pptp.c b/epan/dissectors/packet-pptp.c index 49cd3f8fd7..98b398a852 100644 --- a/epan/dissectors/packet-pptp.c +++ b/epan/dissectors/packet-pptp.c @@ -294,7 +294,7 @@ dissect_stop_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 1, ENC_NA); offset += 1; - proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, ENC_NA);; + proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, ENC_NA); } static void @@ -308,7 +308,7 @@ dissect_stop_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree_add_item(tree, hf_pptp_error, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, ENC_NA);; + proto_tree_add_item(tree, hf_pptp_reserved, tvb, offset, 2, ENC_NA); } @@ -316,7 +316,7 @@ static void dissect_echo_req(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { - proto_tree_add_item(tree, hf_pptp_identifier, tvb, offset, 4, ENC_BIG_ENDIAN);; + proto_tree_add_item(tree, hf_pptp_identifier, tvb, offset, 4, ENC_BIG_ENDIAN); } static void diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c index a50c5982ea..3c496a0f10 100644 --- a/epan/dissectors/packet-radius.c +++ b/epan/dissectors/packet-radius.c @@ -1810,7 +1810,7 @@ extern void radius_register_avp_dissector(guint32 vendor_id, guint32 attribute_i } if (!dictionary_entry) { - dictionary_entry = g_malloc(sizeof(radius_attr_info_t));; + dictionary_entry = g_malloc(sizeof(radius_attr_info_t)); dictionary_entry->name = g_strdup_printf("Unknown-Attribute-%u",attribute_id); dictionary_entry->code = attribute_id; diff --git a/epan/dissectors/packet-rlm.c b/epan/dissectors/packet-rlm.c index d1d7f17a8a..dd3f2b82bd 100644 --- a/epan/dissectors/packet-rlm.c +++ b/epan/dissectors/packet-rlm.c @@ -140,23 +140,23 @@ dissect_rlm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch (rlm_type) { case RLM_START_REQUEST: type_str = "Start request"; - break;; + break; case RLM_START_ACK: type_str = "Start acknowledgement"; - break;; + break; case RLM_ECHO_REQUEST: type_str = "Echo request"; - break;; + break; case RLM_ECHO_REPLY: type_str = "Echo reply"; - break;; + break; default: type_str = "Unknown type"; - break;; + break; } col_set_str(pinfo->cinfo, COL_INFO, type_str); diff --git a/epan/dissectors/packet-rtp-midi.c b/epan/dissectors/packet-rtp-midi.c index 8594620e16..104a5b8849 100644 --- a/epan/dissectors/packet-rtp-midi.c +++ b/epan/dissectors/packet-rtp-midi.c @@ -6120,7 +6120,7 @@ decode_cj_chapter_n( tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, un for ( i = 0; i < log_count; i++ ) { note = tvb_get_guint8( tvb, offset ) & 0x7f; - velocity = tvb_get_guint8( tvb, offset + 1 ) & 0x7f;; + velocity = tvb_get_guint8( tvb, offset + 1 ) & 0x7f; note_str = val_to_str( note, rtp_midi_note_values, rtp_midi_unknown_value_dec ); diff --git a/epan/dissectors/packet-spice.c b/epan/dissectors/packet-spice.c index 70b036de30..7df4795213 100644 --- a/epan/dissectors/packet-spice.c +++ b/epan/dissectors/packet-spice.c @@ -1468,7 +1468,7 @@ static guint32 dissect_Image(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset) { guint32 ImageSize = 0; - const guint8 type = dissect_ImageDescriptor(tvb, tree, offset);; + const guint8 type = dissect_ImageDescriptor(tvb, tree, offset); offset += sizeof_ImageDescriptor; diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index 0d5084ca63..dc16ef711f 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -2337,7 +2337,7 @@ tls_check_mac(SslDecoder*decoder, gint ct, gint ver, guint8* data, digests[decoder->cipher_suite->dig-0x40], md); if (ssl_hmac_init(&hm,decoder->mac_key.data,decoder->mac_key.data_len,md) != 0) - return -1;; + return -1; /* hash sequence number */ fmt_seq(decoder->seq,buf); diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c index 230ed444e0..446a6f103f 100644 --- a/epan/dissectors/packet-umts_fp.c +++ b/epan/dissectors/packet-umts_fp.c @@ -2846,7 +2846,7 @@ static void dissect_e_dch_t2_or_common_channel_info(tvbuff_t *tvb, packet_info * /* Add data summary to info column */ col_append_fstr(pinfo->cinfo, COL_INFO, " (%u bytes in %u SDUs in %u MAC-is PDUs in %u subframes)", - total_bytes, macis_sdus_found, macis_pdus, number_of_subframes);; + total_bytes, macis_sdus_found, macis_pdus, number_of_subframes); /* Spare extension and payload CRC (optional) */ dissect_spare_extension_and_crc(tvb, pinfo, tree, diff --git a/epan/dissectors/packet-wlccp.c b/epan/dissectors/packet-wlccp.c index 2022878abb..85a1ebd7e5 100644 --- a/epan/dissectors/packet-wlccp.c +++ b/epan/dissectors/packet-wlccp.c @@ -2615,7 +2615,7 @@ static guint dissect_wlccp_rrm_tlv(proto_tree *_tree, tvbuff_t *_tvb, guint _off proto_tree_add_item(_80211_capabilities_tree, hf_80211_cap_ibss, _tvb, _offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(_80211_capabilities_tree, hf_80211_cap_ess, - _tvb, _offset, 2, ENC_BIG_ENDIAN);; + _tvb, _offset, 2, ENC_BIG_ENDIAN); /* proto_tree_add_item(_tree, hf_wlccp_capabilities, _tvb, _offset, 2, ENC_BIG_ENDIAN); */ _offset += 2; diff --git a/epan/uat_load.l b/epan/uat_load.l index f1df697db4..747e2e011d 100644 --- a/epan/uat_load.l +++ b/epan/uat_load.l @@ -249,7 +249,7 @@ comment #[^\n]*\n ERROR(("%s",err)); } - colnum = 0;; + colnum = 0; ptr = NULL; len = 0; memset(record,0,uat->record_size); diff --git a/plugins/mate/mate_setup.c b/plugins/mate/mate_setup.c index c711188ba0..5aeb8a5adb 100644 --- a/plugins/mate/mate_setup.c +++ b/plugins/mate/mate_setup.c @@ -207,7 +207,7 @@ extern gchar* add_ranges(gchar* range,GPtrArray* range_ptr_arr) { g_string_append_printf(matecfg->fields_filter, "||%s",ranges[i]); } else { g_strfreev(ranges); - return g_strdup_printf("no such proto: '%s'",ranges[i]);; + return g_strdup_printf("no such proto: '%s'",ranges[i]); } } @@ -584,7 +584,7 @@ extern mate_config* mate_make_config(const gchar* filename, int mate_hfid) { matecfg->dbg_facility = NULL; - matecfg->mate_lib_path = g_strdup_printf("%s%c%s%c",get_datafile_dir(),DIR_SEP,DEFAULT_MATE_LIB_PATH,DIR_SEP);; + matecfg->mate_lib_path = g_strdup_printf("%s%c%s%c",get_datafile_dir(),DIR_SEP,DEFAULT_MATE_LIB_PATH,DIR_SEP); matecfg->pducfgs = g_hash_table_new(g_str_hash,g_str_equal); matecfg->gopcfgs = g_hash_table_new(g_str_hash,g_str_equal); @@ -1671,7 +1671,7 @@ const gchar* get_node_field_value(field_info* fi, epan_dissect_t* edt) return fi->rep->representation; } else { /* Just print out the protocol abbreviation */ - return fi->hfinfo->abbrev;; + return fi->hfinfo->abbrev; } case FT_NONE: /* Return "1" so that the presence of a field of type diff --git a/ui/cli/tap-comparestat.c b/ui/cli/tap-comparestat.c index 81b063b2d9..933cca8cec 100644 --- a/ui/cli/tap-comparestat.c +++ b/ui/cli/tap-comparestat.c @@ -315,7 +315,7 @@ call_foreach_merge_settings(gpointer value, gpointer arg) if((fInfo->num==tot_packet_amount)&&(cs->stop_packet_nr_first!=G_MAXINT32)){ /* calculate missing stop number */ swap=cs->stop_packet_nr_first; - cs->stop_packet_nr_first=tot_packet_amount-cs->second_file_amount;; + cs->stop_packet_nr_first=tot_packet_amount-cs->second_file_amount; cs->stop_packet_nr_second=swap; } diff --git a/ui/cli/tap-funnel.c b/ui/cli/tap-funnel.c index 9fcd10ed33..8abbc50de3 100644 --- a/ui/cli/tap-funnel.c +++ b/ui/cli/tap-funnel.c @@ -140,7 +140,7 @@ void funnel_dump_all_text_windows(void) { #if 0 -GHashTable* menus = NULL;; +GHashTable* menus = NULL; typedef struct _menu_cb_t { void (*callback)(gpointer); void* callback_data; diff --git a/ui/gtk/about_dlg.c b/ui/gtk/about_dlg.c index 57bb178420..5c56ecbf81 100644 --- a/ui/gtk/about_dlg.c +++ b/ui/gtk/about_dlg.c @@ -235,7 +235,7 @@ splash_update(register_action_e action, const char *message, gpointer client_dat action_msg = "Loading configuration files ..."; break; default: - action_msg = "(Unknown action)";; + action_msg = "(Unknown action)"; break; } splash_update_label(win, action_msg); diff --git a/ui/gtk/compare_stat.c b/ui/gtk/compare_stat.c index 904a14f97e..707ed42ccf 100644 --- a/ui/gtk/compare_stat.c +++ b/ui/gtk/compare_stat.c @@ -401,7 +401,7 @@ call_foreach_merge_settings(gpointer value, gpointer arg) if((fInfo->num==tot_packet_amount)&&(cs->stop_packet_nr_first!=G_MAXINT32)){ /* calculate missing stop number */ swap=cs->stop_packet_nr_first; - cs->stop_packet_nr_first=tot_packet_amount-cs->second_file_amount;; + cs->stop_packet_nr_first=tot_packet_amount-cs->second_file_amount; cs->stop_packet_nr_second=swap; } diff --git a/ui/gtk/sctp_stat.c b/ui/gtk/sctp_stat.c index 1680e11f7a..0911b24ff6 100644 --- a/ui/gtk/sctp_stat.c +++ b/ui/gtk/sctp_stat.c @@ -745,7 +745,7 @@ packet(void *tapdata _U_, packet_info *pinfo , epan_dissect_t *edt _U_ , const v if (type == IPV4ADDRESS_PARAMETER_ID) { store = g_malloc(sizeof (address)); - store->type = AT_IPv4;; + store->type = AT_IPv4; store->len = 4; store->data = g_malloc(4); tvb_memcpy(sctp_info->tvb[chunk_number], (guint8 *)(store->data),IPV4_ADDRESS_OFFSET, 4); @@ -754,7 +754,7 @@ packet(void *tapdata _U_, packet_info *pinfo , epan_dissect_t *edt _U_ , const v else if (type == IPV6ADDRESS_PARAMETER_ID) { store = g_malloc(sizeof (address)); - store->type = AT_IPv6;; + store->type = AT_IPv6; store->len = 16; store->data = g_malloc(16); tvb_memcpy(sctp_info->tvb[chunk_number], (guint8 *)(store->data),IPV6_ADDRESS_OFFSET, IPV6_ADDRESS_LENGTH); @@ -1059,7 +1059,7 @@ packet(void *tapdata _U_, packet_info *pinfo , epan_dissect_t *edt _U_ , const v if (type == IPV4ADDRESS_PARAMETER_ID) { store = g_malloc(sizeof (address)); - store->type = AT_IPv4;; + store->type = AT_IPv4; store->len = 4; store->data = g_malloc(4); tvb_memcpy(sctp_info->tvb[chunk_number], (guint8 *)(store->data),IPV4_ADDRESS_OFFSET, 4); @@ -1068,7 +1068,7 @@ packet(void *tapdata _U_, packet_info *pinfo , epan_dissect_t *edt _U_ , const v else if (type == IPV6ADDRESS_PARAMETER_ID) { store = g_malloc(sizeof (address)); - store->type = AT_IPv6;; + store->type = AT_IPv6; store->len = 16; store->data = g_malloc(16); tvb_memcpy(sctp_info->tvb[chunk_number], (guint8 *)(store->data),IPV6_ADDRESS_OFFSET, IPV6_ADDRESS_LENGTH); diff --git a/ui/gtk/text_import.c b/ui/gtk/text_import.c index d2b8cfbfe7..6c8d9321b1 100644 --- a/ui/gtk/text_import.c +++ b/ui/gtk/text_import.c @@ -524,7 +524,7 @@ write_current_packet (void) pkthdr.ts.secs = (guint32)ts_sec; pkthdr.ts.nsecs = ts_usec * 1000; if (ts_fmt == NULL) { ts_usec++; } /* fake packet counter */ - pkthdr.caplen = pkthdr.len = prefix_length + curr_offset + eth_trailer_length;; + pkthdr.caplen = pkthdr.len = prefix_length + curr_offset + eth_trailer_length; pkthdr.pkt_encap = pcap_link_type; wtap_dump(wdh, &pkthdr, NULL, packet_buf, &err); diff --git a/wiretap/file_wrappers.c b/wiretap/file_wrappers.c index a5f4739f15..9f3999a2c5 100644 --- a/wiretap/file_wrappers.c +++ b/wiretap/file_wrappers.c @@ -401,7 +401,7 @@ static void zlib_fast_seek_add(FILE_T file, struct zlib_cur_seek_point *point, int bits, gint64 in_pos, gint64 out_pos) { /* it's for sure after gzip header, so file->fast_seek->len != 0 */ - struct fast_seek_point *item = file->fast_seek->pdata[file->fast_seek->len - 1];; + struct fast_seek_point *item = file->fast_seek->pdata[file->fast_seek->len - 1]; #ifndef HAVE_INFLATEPRIME if (bits) diff --git a/wiretap/lanalyzer.c b/wiretap/lanalyzer.c index 75331c665b..498855bbef 100644 --- a/wiretap/lanalyzer.c +++ b/wiretap/lanalyzer.c @@ -341,7 +341,7 @@ int lanalyzer_open(wtap *wth, int *err, gchar **err_info) * Let's get some info from it. Note that we get wth->snapshot_length * from a record later in the file. */ wth->file_type = WTAP_FILE_LANALYZER; - lanalyzer = (lanalyzer_t *)g_malloc(sizeof(lanalyzer_t));; + lanalyzer = (lanalyzer_t *)g_malloc(sizeof(lanalyzer_t)); wth->priv = (void *)lanalyzer; wth->subtype_read = lanalyzer_read; wth->subtype_seek_read = lanalyzer_seek_read; diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c index 22ace095ae..bf2a5aceb0 100644 --- a/wiretap/libpcap.c +++ b/wiretap/libpcap.c @@ -257,7 +257,7 @@ int libpcap_open(wtap *wth, int *err, gchar **err_info) } /* This is a libpcap file */ - libpcap = (libpcap_t *)g_malloc(sizeof(libpcap_t));; + libpcap = (libpcap_t *)g_malloc(sizeof(libpcap_t)); libpcap->byte_swapped = byte_swapped; libpcap->version_major = hdr.version_major; libpcap->version_minor = hdr.version_minor; diff --git a/wiretap/netscaler.c b/wiretap/netscaler.c index 4c9a39e2e0..da3fc5b0cf 100644 --- a/wiretap/netscaler.c +++ b/wiretap/netscaler.c @@ -1006,7 +1006,7 @@ gboolean nstrace_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset #define __TNO(enumprefix,structprefix,structname,hdrname,structfieldname) \ pseudo_header->nstr.hdrname##_offset = (guint8) enumprefix##_##hdrname##_offset; #define __TNL(enumprefix,structprefix,structname,hdrname,structfieldname) \ - pseudo_header->nstr.hdrname##_len = (guint8) enumprefix##_##hdrname##_len;; + pseudo_header->nstr.hdrname##_len = (guint8) enumprefix##_##hdrname##_len; #define __TNV1O(enumprefix,structprefix,structname,hdrname,structfieldname) \ __TNO(enumprefix,structprefix,structname,hdrname,structfieldname) diff --git a/wsutil/crc16.c b/wsutil/crc16.c index cf1e87b20d..2125de96e1 100644 --- a/wsutil/crc16.c +++ b/wsutil/crc16.c @@ -200,7 +200,7 @@ static guint16 crc16_unreflected(const guint8 *buf, guint len, /* we use guints, rather than guint16s, as they are likely to be faster. We just ignore the top 16 bits and let them do what they want. */ - guint crc16 = (guint)crc_in;; + guint crc16 = (guint)crc_in; while( len-- != 0 ) crc16 = table[((crc16 >> 8) ^ *buf++) & 0xff] ^ (crc16 << 8); |