From 993b47eb400e9a9aa79e22f9fb0fc5da4e45f978 Mon Sep 17 00:00:00 2001 From: chinarulezzz Date: Mon, 23 Apr 2018 21:45:48 +0300 Subject: [PATCH] remove redundant break statement Change-Id: Ib6d4bbb1662d921fc4b5920b50e47d2b30ebb95c Reviewed-on: https://code.wireshark.org/review/27103 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- epan/dissectors/packet-megaco.c | 1 - epan/prefs.c | 1 - rawshark.c | 2 -- ui/qt/models/fileset_entry_model.cpp | 8 -------- wsutil/rsa.c | 1 - 5 files changed, 13 deletions(-) diff --git a/epan/dissectors/packet-megaco.c b/epan/dissectors/packet-megaco.c index aa47ed0a49..5603b602ec 100644 --- a/epan/dissectors/packet-megaco.c +++ b/epan/dissectors/packet-megaco.c @@ -3287,7 +3287,6 @@ dissect_megaco_LocalControldescriptor(tvbuff_t *tvb, proto_tree *megaco_mediades tvb_help_offset, tvb_offset - tvb_help_offset, tvb_format_text(tvb, tvb_current_offset, tokenlen)); tvb_current_offset = megaco_tvb_skip_wsp(tvb, tvb_offset + 1); break; - break; case MEGACO_TMAN_POL: proto_tree_add_string(megaco_LocalControl_tree, hf_megaco_tman_pol, tvb, tvb_help_offset, tvb_offset-tvb_help_offset, tvb_format_text(tvb, tvb_current_offset, tokenlen)); diff --git a/epan/prefs.c b/epan/prefs.c index c2d1dfc9dd..b7457f9bde 100644 --- a/epan/prefs.c +++ b/epan/prefs.c @@ -6087,7 +6087,6 @@ prefs_pref_type_description(pref_t *pref) } g_string_append(enum_str, "\n(case-insensitive)."); return g_string_free(enum_str, FALSE); - break; } case PREF_STRING: diff --git a/rawshark.c b/rawshark.c index 52f1e04022..4371c5b058 100644 --- a/rawshark.c +++ b/rawshark.c @@ -700,14 +700,12 @@ main(int argc, char *argv[]) g_string_free(comp_info_str, TRUE); g_string_free(runtime_info_str, TRUE); goto clean_exit; - break; } default: case '?': /* Bad flag - print usage message */ print_usage(stderr); ret = INVALID_OPTION; goto clean_exit; - break; } } diff --git a/ui/qt/models/fileset_entry_model.cpp b/ui/qt/models/fileset_entry_model.cpp index 2c91179e84..26bc305e03 100644 --- a/ui/qt/models/fileset_entry_model.cpp +++ b/ui/qt/models/fileset_entry_model.cpp @@ -44,7 +44,6 @@ QVariant FilesetEntryModel::data(const QModelIndex &index, int role) const switch (index.column()) { case Name: return QString(entry->name); - break; case Created: { QString created = nameToDate(entry->name); @@ -66,14 +65,11 @@ QVariant FilesetEntryModel::data(const QModelIndex &index, int role) const } } return created; - break; } case Modified: return time_tToString(entry->mtime); - break; case Size: return file_size_to_qstring(entry->size); - break; default: break; } @@ -98,16 +94,12 @@ QVariant FilesetEntryModel::headerData(int section, Qt::Orientation, int role) c switch (section) { case Name: return tr("Filename"); - break; case Created: return tr("Created"); - break; case Modified: return tr("Modified"); - break; case Size: return tr("Size"); - break; default: break; } diff --git a/wsutil/rsa.c b/wsutil/rsa.c index 33a69f717f..e8c86342b5 100644 --- a/wsutil/rsa.c +++ b/wsutil/rsa.c @@ -319,7 +319,6 @@ rsa_load_pkcs12(FILE *fp, const gchar *cert_passwd, char **err) /* Private key found, return it. */ priv_key = rsa_pkey; goto done; - break; } default: ;