Bug 842931 - Remove unused private member variable nsPKCS12Blob::mTmpFilePath. r=bsmith
authorChris Peterson <cpeterson@mozilla.com>
Wed, 20 Feb 2013 00:47:12 -0800
changeset 122716 1d8799803f37bb83cc8ce5f997206999b25ccb28
parent 122715 67bee77ac7e37ab95dfd47c35783ccef47af570c
child 122717 be239b15a0f1334b216985bd91e6f89834c43b48
push id23457
push usercpeterson@mozilla.com
push dateSat, 23 Feb 2013 04:35:49 +0000
treeherdermozilla-inbound@1d8799803f37 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmith
bugs842931
milestone22.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 842931 - Remove unused private member variable nsPKCS12Blob::mTmpFilePath. r=bsmith
security/manager/ssl/src/nsPKCS12Blob.cpp
security/manager/ssl/src/nsPKCS12Blob.h
--- a/security/manager/ssl/src/nsPKCS12Blob.cpp
+++ b/security/manager/ssl/src/nsPKCS12Blob.cpp
@@ -46,17 +46,16 @@ static NS_DEFINE_CID(kNSSComponentCID, N
 #define PIP_PKCS12_NOSMARTCARD_EXPORT  4
 #define PIP_PKCS12_RESTORE_FAILED      5
 #define PIP_PKCS12_BACKUP_FAILED       6
 #define PIP_PKCS12_NSS_ERROR           7
 
 // constructor
 nsPKCS12Blob::nsPKCS12Blob():mCertArray(0),
                              mTmpFile(nullptr),
-                             mTmpFilePath(nullptr),
                              mDigest(nullptr),
                              mDigestIterator(nullptr),
                              mTokenSet(false)
 {
   mUIContext = new PipUIContext();
 }
 
 // destructor
@@ -825,9 +824,8 @@ nsPKCS12Blob::handleError(int myerr)
   if (!msgID)
     msgID = "PKCS12UnknownErr";
 
   nsresult rv;
   nsCOMPtr<nsINSSComponent> nssComponent = do_GetService(kNSSComponentCID, &rv);
   if (NS_SUCCEEDED(rv))
     (void) nssComponent->ShowAlertFromStringBundle(msgID);
 }
-
--- a/security/manager/ssl/src/nsPKCS12Blob.h
+++ b/security/manager/ssl/src/nsPKCS12Blob.h
@@ -71,17 +71,16 @@ private:
   
   enum RetryReason { rr_do_not_retry, rr_bad_password, rr_auto_retry_empty_password_flavors };
   enum ImportMode { im_standard_prompt, im_try_zero_length_secitem };
   
   nsresult ImportFromFileHelper(nsIFile *file, ImportMode aImportMode, RetryReason &aWantRetry);
 
   // NSPR file I/O for export file
   PRFileDesc *mTmpFile;
-  char       *mTmpFilePath;
 
   // simulated file I/O for "in memory" temporary digest data
   nsCString                 *mDigest;
   nsCString::const_iterator *mDigestIterator;
 
   bool        mTokenSet;
 
   // C-style callback functions for the NSS PKCS#12 library
@@ -90,9 +89,8 @@ private:
   static int       digest_read(void *, unsigned char *, unsigned long);
   static int       digest_write(void *, unsigned char *, unsigned long);
   static SECItem * nickname_collision(SECItem *, PRBool *, void *);
   static void write_export_file(void *arg, const char *buf, unsigned long len);
 
 };
 
 #endif /* _NS_PKCS12BLOB_H_ */
-