Merge branch '46-just-use-clang-format-to-reformat-sources' into 'master'
Reformat source code with clang-format Closes #46 See merge request isc-projects/bind9!2156 (cherry picked from commit7099e79a9b)4c3b063eImport Linux kernel .clang-format with small modificationsf50b1e06Use clang-format to reformat the source files11341c76Update the definition files for Windowsdf6c1f76Remove tkey_test (which is no-op anyway)
This commit is contained in:
@@ -16,20 +16,19 @@
|
||||
#include <dns/log.h>
|
||||
#include <dns/result.h>
|
||||
|
||||
#include <pk11/pk11.h>
|
||||
#include <pk11/internal.h>
|
||||
|
||||
#include "dst_internal.h"
|
||||
#include "dst_pkcs11.h"
|
||||
|
||||
#include <pk11/internal.h>
|
||||
#include <pk11/pk11.h>
|
||||
|
||||
isc_result_t
|
||||
dst__pkcs11_toresult(const char *funcname, const char *file, int line,
|
||||
isc_result_t fallback, CK_RV rv)
|
||||
{
|
||||
isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL,
|
||||
DNS_LOGMODULE_CRYPTO, ISC_LOG_WARNING,
|
||||
"%s:%d: %s: Error = 0x%.8lX\n",
|
||||
file, line, funcname, rv);
|
||||
isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL, DNS_LOGMODULE_CRYPTO,
|
||||
ISC_LOG_WARNING, "%s:%d: %s: Error = 0x%.8lX\n", file,
|
||||
line, funcname, rv);
|
||||
if (rv == CKR_HOST_MEMORY)
|
||||
return (ISC_R_NOMEMORY);
|
||||
return (fallback);
|
||||
|
||||
Reference in New Issue
Block a user