upstream: Use the LogLevel typdef instead of int where appropriate. Patch from Markus...

OpenBSD-Commit-ID: 4c0f0f458e3da7807806b35e3eb5c1e8403c968a

diff --git a/clientloop.c b/clientloop.c
index 086c0dfe8e6be0414aad42969366985c352e0315..755f2923110276b3159948379d8c995a14602473 100644 (file)
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.322 2019/03/29 11:31:40 djm Exp $ */
+/* $OpenBSD: clientloop.c,v 1.323 2019/04/23 11:56:41 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1881,7 +1881,7 @@ static void
 update_known_hosts(struct hostkeys_update_ctx *ctx)
 {
        int r, was_raw = 0;
-       int loglevel = options.update_hostkeys == SSH_UPDATE_HOSTKEYS_ASK ?
+       LogLevel loglevel = options.update_hostkeys == SSH_UPDATE_HOSTKEYS_ASK ?
            SYSLOG_LEVEL_INFO : SYSLOG_LEVEL_VERBOSE;
        char *fp, *response;
        size_t i;

diff --git a/ssh.c b/ssh.c
index 91e7c3511ded0ecba860c04cac314196497457f1..f46a3b262dbc57ecb0dcc4d9d67025da4ba1416b 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.500 2019/01/19 21:43:56 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.501 2019/04/23 11:56:41 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -236,7 +236,8 @@ resolve_host(const char *name, int port, int logerr, char *cname, size_t clen)
 {
        char strport[NI_MAXSERV];
        struct addrinfo hints, *res;
-       int gaierr, loglevel = SYSLOG_LEVEL_DEBUG1;
+       int gaierr;
+       LogLevel loglevel = SYSLOG_LEVEL_DEBUG1;
 
        if (port <= 0)
                port = default_ssh_port();