mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-15 20:12:00 -04:00
Merge tag 'clang-fixes-7.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/nathan/linux
Pull Clang build fix from Nathan Chancellor: - Wrap declaration and assignment of key_pass in certs/extract-cert.c with '#ifdef' that matches its only usage to clear up an instance of a new clang subwarning, -Wunused-but-set-global. * tag 'clang-fixes-7.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/nathan/linux: extract-cert: Wrap key_pass with '#ifdef USE_PKCS11_ENGINE'
This commit is contained in:
@@ -41,7 +41,9 @@ void format(void)
|
||||
exit(2);
|
||||
}
|
||||
|
||||
#ifdef USE_PKCS11_ENGINE
|
||||
static const char *key_pass;
|
||||
#endif
|
||||
static BIO *wb;
|
||||
static char *cert_dst;
|
||||
static bool verbose;
|
||||
@@ -133,7 +135,9 @@ int main(int argc, char **argv)
|
||||
if (verbose_env && strchr(verbose_env, '1'))
|
||||
verbose = true;
|
||||
|
||||
key_pass = getenv("KBUILD_SIGN_PIN");
|
||||
#ifdef USE_PKCS11_ENGINE
|
||||
key_pass = getenv("KBUILD_SIGN_PIN");
|
||||
#endif
|
||||
|
||||
if (argc != 3)
|
||||
format();
|
||||
|
||||
Reference in New Issue
Block a user