From Evan Huus:

Duplicate and misplaced 'break' statements.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7106

svn path=/trunk/; revision=42091

10 files changed, 3 insertions, 16 deletions

diff --git a/epan/dissectors/packet-ansi_a.c b/epan/dissectors/packet-ansi_a.c
index a8943df0e9..c927a860b7 100644
--- a/epan/dissectors/packet-ansi_a.c
+++ b/epan/dissectors/packet-ansi_a.c
@@ -4549,7 +4549,7 @@ elem_cause_l3(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint32 o
     case 7: str = "International network"; break;
     case 10: str = "Network beyond interworking point"; break;
     default:
-        str = "Reserved"; break;
+        str = "Reserved";
         break;
     }
 
diff --git a/epan/dissectors/packet-asap.c b/epan/dissectors/packet-asap.c
index 40ba7147f4..0f5d4314eb 100644
--- a/epan/dissectors/packet-asap.c
+++ b/epan/dissectors/packet-asap.c
@@ -187,7 +187,6 @@ dissect_error_cause(tvbuff_t *cause_tvb, proto_tree *parameter_tree)
     message_tvb = tvb_new_subset_remaining(cause_tvb, CAUSE_INFO_OFFSET);
     dissect_asap(message_tvb, NULL, cause_tree);
     break;
-    break;
   case INVALID_VALUES:
     parameter_tvb = tvb_new_subset_remaining(cause_tvb, CAUSE_INFO_OFFSET);
     dissect_parameter(parameter_tvb, cause_tree);
diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c
index 7b35b03fa6..6ffc9d1cc4 100644
--- a/epan/dissectors/packet-dns.c
+++ b/epan/dissectors/packet-dns.c
@@ -1408,11 +1408,8 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
       int i;
       emem_strbuf_t *bitnames = ep_strbuf_new_label(NULL);
 
-      if (rr_len < 4) {
-
+      if (rr_len < 4)
 	  goto bad_rr;
-	break;
-      }
       wks_addr = tvb_ip_to_str(tvb, cur_offset);
       if (cinfo != NULL)
 	col_append_fstr(cinfo, COL_INFO, " %s", wks_addr);
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index 8051351184..8887f3d86f 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -6301,8 +6301,8 @@ dissect_vendor_ie_atheros(proto_item * item _U_, proto_tree * ietree,
           default:
           /* No default Action */
           break;
-        break;
         } /* End switch(subtype) */
+        break;
         default:
         /* No default Action */
         break;
diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c
index 183caf33f9..c99c09fe58 100644
--- a/epan/dissectors/packet-isakmp.c
+++ b/epan/dissectors/packet-isakmp.c
@@ -3435,7 +3435,6 @@ dissect_transform_ike2_attribute(tvbuff_t *tvb, proto_tree *transform_attr_type_
 		proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_ike2_attr_key_length, tvb, offset, optlen, ENC_BIG_ENDIAN);
                 proto_item_append_text(transform_attr_type_item," : %d", tvb_get_ntohs(tvb, offset));
 		break;
-		break;
 	default:
 		/* No Default Action */
 		break;
diff --git a/epan/dissectors/packet-spice.c b/epan/dissectors/packet-spice.c
index 7df4795213..fbd316dc4d 100644
--- a/epan/dissectors/packet-spice.c
+++ b/epan/dissectors/packet-spice.c
@@ -2227,7 +2227,6 @@ dissect_spice_playback_server(tvbuff_t *tvb, proto_tree *tree, const guint16 mes
             offset += 4;
             /* TODO - mode dependent, there may be more data here */
             break;
-            break;
         case SPICE_PLAYBACK_MODE:
             proto_tree_add_item(tree, hf_playback_record_mode_timstamp, tvb, offset, 4, ENC_LITTLE_ENDIAN);
             offset += 4;
diff --git a/epan/strutil.c b/epan/strutil.c
index d446fa08b0..ebd4c49040 100644
--- a/epan/strutil.c
+++ b/epan/strutil.c
@@ -418,7 +418,6 @@ hex_str_to_bytes(const char *hex_str, GByteArray *bytes, gboolean force_separato
 				}
 				else if (force_separators) {
 					return FALSE;
-					break;
 				}
 			}
 			p = punct;
@@ -450,7 +449,6 @@ hex_str_to_bytes(const char *hex_str, GByteArray *bytes, gboolean force_separato
 				}
 				else if (force_separators) {
 					return FALSE;
-					break;
 				}
 			}
 			p = punct;
diff --git a/epan/tcap-persistentdata.c b/epan/tcap-persistentdata.c
index 1eff9a3b17..314e7ac57c 100644
--- a/epan/tcap-persistentdata.c
+++ b/epan/tcap-persistentdata.c
@@ -496,7 +496,6 @@ find_tcaphash_begin(struct tcaphash_begin_info_key_t *p_tcaphash_begin_key,
           dbg(10,"B%d ", p_tcaphash_begincall->context->session_id);
 #endif
           return p_tcaphash_begincall;
-          break;
         }
 #ifdef DEBUG_TCAPSRT
       dbg(60,"[B%d] ", p_tcaphash_begincall->context->session_id);
@@ -538,7 +537,6 @@ find_tcaphash_cont(struct tcaphash_cont_info_key_t *p_tcaphash_cont_key,
 	  dbg(10,"C%d ", p_tcaphash_contcall->context->session_id);
 #endif
 	  return p_tcaphash_contcall;
-	  break;
 	}
 #ifdef DEBUG_TCAPSRT
 	dbg(60,"[C%d] ", p_tcaphash_contcall->context->session_id);
@@ -585,7 +583,6 @@ find_tcaphash_end(struct tcaphash_end_info_key_t *p_tcaphash_end_key,
 	  dbg(10,"E%d ", p_tcaphash_endcall->context->session_id);
 #endif
 	  return p_tcaphash_endcall;
-	  break;
 	}
 #ifdef DEBUG_TCAPSRT
 	  dbg(60,"[E%d] ", p_tcaphash_endcall->context->session_id);
diff --git a/rawshark.c b/rawshark.c
index de04ec7134..cad08a9afe 100644
--- a/rawshark.c
+++ b/rawshark.c
@@ -1425,7 +1425,6 @@ protocolinfo_init(char *field)
                    ftenum_to_string(hfi),
                    absolute_time_display_e_to_string(hfi->display));
             break;
-            break;
 
         default:
             printf("%u %s %s - ",
diff --git a/tshark.c b/tshark.c
index 1918ae1e3a..04b723d88d 100644
--- a/tshark.c
+++ b/tshark.c
@@ -1338,7 +1338,6 @@ main(int argc, char *argv[])
       g_string_free(comp_info_str, TRUE);
       g_string_free(runtime_info_str, TRUE);
       return 0;
-      break;
     }
     case 'O':        /* Only output these protocols */
       output_only = g_strdup(optarg);