upstream commit

Remove dead breaks, found via opencoverage.net.  ok
deraadt@

Upstream-ID: ad9cc655829d67fad219762810770787ba913069

diff --git a/servconf.c b/servconf.c
index 4bf0b2a35dc4c7ca4577323d1d8a92a38b201ff6..35abec489f2a662f7331c288d722112523700d4c 100644 (file)
--- a/servconf.c
+++ b/servconf.c
@@ -1,5 +1,5 @@
 
-/* $OpenBSD: servconf.c,v 1.297 2016/09/28 20:32:42 djm Exp $ */
+/* $OpenBSD: servconf.c,v 1.298 2016/10/24 01:09:17 dtucker Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -1116,7 +1116,6 @@ process_server_config_line(ServerOptions *options, char *line,
                            MAX_HOSTCERTS);
                charptr = &options->host_cert_files[*intptr];
                goto parse_filename;
-               break;
 
        case sPidFile:
                charptr = &options->pid_file;

diff --git a/sshkey.c b/sshkey.c
index 25a360b7baa14110a244f38a1cd645bab669cadf..c01da6c39b2e9950e81caa16de7bab8e9458abb4 100644 (file)
--- a/sshkey.c
+++ b/sshkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshkey.c,v 1.40 2016/10/04 21:34:40 djm Exp $ */
+/* $OpenBSD: sshkey.c,v 1.41 2016/10/24 01:09:17 dtucker Exp $ */
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Alexander von Gernler.  All rights reserved.
@@ -512,7 +512,6 @@ sshkey_new(int type)
        default:
                free(k);
                return NULL;
-               break;
        }
 
        if (sshkey_is_cert(k)) {