Argh. I thought I had compiled this! fixe compile errors.
authorrelyea%netscape.com
Thu, 16 May 2002 20:48:27 +0000
changeset 3138 9c037d2e8864f5efe9ecf7c99c17b84545ccf5db
parent 3137 1c356b43e7043e3b87a6c589fd7d3036f0174de3
child 3139 e916be1e4ef1385f962652a7c95a20b37e5d75ed
push idunknown
push userunknown
push dateunknown
Argh. I thought I had compiled this! fixe compile errors.
security/nss/lib/softoken/dbinit.c
security/nss/lib/softoken/pcertdb.c
--- a/security/nss/lib/softoken/dbinit.c
+++ b/security/nss/lib/softoken/dbinit.c
@@ -299,28 +299,28 @@ struct RDBStr {
     int (*xactdone)(DB *db, PRBool abort);
 };
 
 #define DB_RDB ((DBTYPE) 0xff)
 
 int
 db_BeginTransaction(DB *db)
 {
-    RDB *rdb = (RDB *)db;
+    struct RDBStr *rdb = (struct RDBStr *)db;
     if (db->type != DB_RDB) {
 	return 0;
     }
 
     return rdb->xactstart(db);
 }
 
 int
 db_FinishTransaction(DB *db, PRBool abort)
 {
-    RDB *rdb = (RDB *)db;
+    struct RDBStr *rdb = (struct RDBStr *)db;
     if (db->type != DB_RDB) {
 	return 0;
     }
 
     return rdb->xactdone(db, abort);
 }
 
 
--- a/security/nss/lib/softoken/pcertdb.c
+++ b/security/nss/lib/softoken/pcertdb.c
@@ -4061,16 +4061,17 @@ done:
 SECStatus
 nsslowcert_AddPermCert(NSSLOWCERTCertDBHandle *dbhandle,
     NSSLOWCERTCertificate *cert, char *nickname, NSSLOWCERTCertTrust *trust)
 {
     char *oldnn;
     certDBEntryCert *entry;
     PRBool conflict;
     SECStatus ret;
+    SECStatus rv;
 
     nsslowcert_LockDB(dbhandle);
     rv = db_BeginTransaction(dbhandle->permCertDB);
     if (rv != SECSuccess) {
 	nsslowcert_UnlockDB(dbhandle);
 	return SECFailure;
     }