Commit ae4c9257 authored by Daniel Bratell's avatar Daniel Bratell Committed by Commit Bot

Removing unused private field from Windows NSSDecryptor

Coding standard and compiler do not like unused private fields, but
sometimes they slip between the cracks until they trigger something:

In file included from gen/chrome/utility/utility_jumbo_1.cc:12:
In file included from .\../../chrome/utility/importer/firefox_importer.cc:26:
In file included from ../..\chrome/utility/importer/nss_decryptor.h:13:
../..\chrome/utility/importer/nss_decryptor_win.h(169,29):  error: private field 'PK11_CheckUserPassword' is not used [-Werror,-Wunused-private-field]
  PK11CheckUserPasswordFunc PK11_CheckUserPassword;
                            ^
1 error generated.

This removes the unsued field. Also removing an "explicit" to get past
presubmit checks.

Running presubmit upload checks ...

L: \src\clean_chromium\src\chrome\utility\importer\nss_decryptor_win.cc:18:  Zero-parameter constructors should not be marked explicit.  [runtime/explicit] [5]
Change-Id: Id310c0f65a406c1a47ec29312472580d15dfd1ce
Reviewed-on: https://chromium-review.googlesource.com/c/1259018
Commit-Queue: Ilya Sherman <isherman@chromium.org>
Reviewed-by: default avatarIlya Sherman <isherman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#596375}
parent 07e0c65c
...@@ -15,7 +15,7 @@ typedef BOOL (WINAPI* SetDllDirectoryFunc)(LPCTSTR lpPathName); ...@@ -15,7 +15,7 @@ typedef BOOL (WINAPI* SetDllDirectoryFunc)(LPCTSTR lpPathName);
// effects of a previous SetDllDirectory call. // effects of a previous SetDllDirectory call.
class SetDllDirectoryCaller { class SetDllDirectoryCaller {
public: public:
explicit SetDllDirectoryCaller() : func_(NULL) { } SetDllDirectoryCaller() : func_(NULL) {}
~SetDllDirectoryCaller() { ~SetDllDirectoryCaller() {
if (func_) if (func_)
...@@ -97,13 +97,18 @@ bool NSSDecryptor::Init(const base::FilePath& dll_path, ...@@ -97,13 +97,18 @@ bool NSSDecryptor::Init(const base::FilePath& dll_path,
} }
NSSDecryptor::NSSDecryptor() NSSDecryptor::NSSDecryptor()
: NSS_Init(NULL), NSS_Shutdown(NULL), PK11_GetInternalKeySlot(NULL), : NSS_Init(NULL),
PK11_CheckUserPassword(NULL), PK11_FreeSlot(NULL), NSS_Shutdown(NULL),
PK11_Authenticate(NULL), PK11SDR_Decrypt(NULL), SECITEM_FreeItem(NULL), PK11_GetInternalKeySlot(NULL),
PL_ArenaFinish(NULL), PR_Cleanup(NULL), PK11_FreeSlot(NULL),
nss3_dll_(NULL), softokn3_dll_(NULL), PK11_Authenticate(NULL),
is_nss_initialized_(false) { PK11SDR_Decrypt(NULL),
} SECITEM_FreeItem(NULL),
PL_ArenaFinish(NULL),
PR_Cleanup(NULL),
nss3_dll_(NULL),
softokn3_dll_(NULL),
is_nss_initialized_(false) {}
NSSDecryptor::~NSSDecryptor() { NSSDecryptor::~NSSDecryptor() {
Free(); Free();
......
...@@ -166,7 +166,6 @@ class NSSDecryptor { ...@@ -166,7 +166,6 @@ class NSSDecryptor {
NSSInitFunc NSS_Init; NSSInitFunc NSS_Init;
NSSShutdownFunc NSS_Shutdown; NSSShutdownFunc NSS_Shutdown;
PK11GetInternalKeySlotFunc PK11_GetInternalKeySlot; PK11GetInternalKeySlotFunc PK11_GetInternalKeySlot;
PK11CheckUserPasswordFunc PK11_CheckUserPassword;
PK11FreeSlotFunc PK11_FreeSlot; PK11FreeSlotFunc PK11_FreeSlot;
PK11AuthenticateFunc PK11_Authenticate; PK11AuthenticateFunc PK11_Authenticate;
PK11SDRDecryptFunc PK11SDR_Decrypt; PK11SDRDecryptFunc PK11SDR_Decrypt;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment