styleCheck: Fix some inconsistent identifiers (#16177)

This commit is contained in:
ee7 2020-12-21 18:41:56 +01:00 • committed by GitHub
commit 297c8e403d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 64 additions and 64 deletions

View file

@ -112,17 +112,17 @@ proc quitExcpt(smtp: Smtp, msg: string) =
const compiledWithSsl = defined(ssl)
when not defined(ssl):
let defaultSSLContext: SSLContext = nil
let defaultSSLContext: SslContext = nil
else:
var defaultSSLContext {.threadvar.}: SSLContext
var defaultSSLContext {.threadvar.}: SslContext
proc getSSLContext(): SSLContext =
proc getSSLContext(): SslContext =
if defaultSSLContext == nil:
defaultSSLContext = newContext(verifyMode = CVerifyNone)
result = defaultSSLContext
proc createMessage*(mSubject, mBody: string, mTo, mCc: seq[string],
otherHeaders: openarray[tuple[name, value: string]]): Message =
otherHeaders: openArray[tuple[name, value: string]]): Message =
## Creates a new MIME compliant message.
##
## You need to make sure that ``mSubject``, ``mTo`` and ``mCc`` don't contain
@ -172,7 +172,7 @@ proc `$`*(msg: Message): string =
result.add(msg.msgBody)
proc newSmtp*(useSsl = false, debug = false,
sslContext: SSLContext = nil): Smtp =
sslContext: SslContext = nil): Smtp =
## Creates a new ``Smtp`` instance.
new result
result.debug = debug
@ -187,7 +187,7 @@ proc newSmtp*(useSsl = false, debug = false,
{.error: "SMTP module compiled without SSL support".}
proc newAsyncSmtp*(useSsl = false, debug = false,
sslContext: SSLContext = nil): AsyncSmtp =
sslContext: SslContext = nil): AsyncSmtp =
## Creates a new ``AsyncSmtp`` instance.
new result
result.debug = debug
@ -222,7 +222,7 @@ proc checkReply*(smtp: Smtp | AsyncSmtp, reply: string) {.multisync.} =
## `SMTP extensions<https://en.wikipedia.org/wiki/Extended_SMTP>`_.
var line = await smtp.debugRecv()
if not line.startswith(reply):
if not line.startsWith(reply):
await quitExcpt(smtp, "Expected " & reply & " reply, got: " & line)
proc helo*(smtp: Smtp | AsyncSmtp) {.multisync.} =
@ -239,7 +239,7 @@ proc connect*(smtp: Smtp | AsyncSmtp,
await smtp.checkReply("220")
await smtp.helo()
proc startTls*(smtp: Smtp | AsyncSmtp, sslContext: SSLContext = nil) {.multisync.} =
proc startTls*(smtp: Smtp | AsyncSmtp, sslContext: SslContext = nil) {.multisync.} =
## Put the SMTP connection in TLS (Transport Layer Security) mode.
## May fail with ReplyError
await smtp.debugSend("STARTTLS\c\L")