From 860aedd664ff9a123a5d01e57e6c58221fd9117e Mon Sep 17 00:00:00 2001
From: "wtc%google.com" <wtc%google.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 7 Dec 2012 02:57:17 +0000
Subject: [PATCH] Bug 813401: remove the unused dbType parameter of
 nssutil_ReadSecmodDB, nssutil_AddSecmodDB, nssutil_DeleteSecmodDB, and
 nssutil_ReleaseSecmodDBData. r=rrelyea.

git-svn-id: svn://10.0.0.236/trunk@264530 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/security/nss/lib/util/utilmod.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/mozilla/security/nss/lib/util/utilmod.c b/mozilla/security/nss/lib/util/utilmod.c
index 3595e291752..d051f7fe8d5 100644
--- a/mozilla/security/nss/lib/util/utilmod.c
+++ b/mozilla/security/nss/lib/util/utilmod.c
@@ -132,7 +132,7 @@ char *_NSSUTIL_GetOldSecmodName(const char *dbname,const char *filename)
     return file;
 }
 
-static SECStatus nssutil_AddSecmodDB(NSSDBType dbType, const char *appName, 
+static SECStatus nssutil_AddSecmodDB(const char *appName, 
 		   const char *filename, const char *dbname, 
 		   char *module, PRBool rw);
 
@@ -166,7 +166,7 @@ lfopen(const char *name, const char *mode, int flags)
  * Read all the existing modules in out of the file.
  */
 static char **
-nssutil_ReadSecmodDB(NSSDBType dbType, const char *appName, 
+nssutil_ReadSecmodDB(const char *appName, 
 		    const char *filename, const char *dbname, 
 		    char *params, PRBool rw)
 {
@@ -415,13 +415,13 @@ loser:
 	fclose(fd);
     } else if (!failed && rw) {
 	/* update our internal module */
-	nssutil_AddSecmodDB(dbType,appName,filename,dbname,moduleList[0],rw);
+	nssutil_AddSecmodDB(appName,filename,dbname,moduleList[0],rw);
     }
     return moduleList;
 }
 
 static SECStatus
-nssutil_ReleaseSecmodDBData(NSSDBType dbType, const char *appName, 
+nssutil_ReleaseSecmodDBData(const char *appName, 
 			const char *filename, const char *dbname, 
 			char **moduleSpecList, PRBool rw)
 {
@@ -436,7 +436,7 @@ nssutil_ReleaseSecmodDBData(NSSDBType dbType, const char *appName,
  * Delete a module from the Data Base
  */
 static SECStatus
-nssutil_DeleteSecmodDB(NSSDBType dbType, const char *appName, 
+nssutil_DeleteSecmodDB(const char *appName, 
 		      const char *filename, const char *dbname, 
 		      char *args, PRBool rw)
 {
@@ -565,7 +565,7 @@ loser:
  * Add a module to the Data base 
  */
 static SECStatus
-nssutil_AddSecmodDB(NSSDBType dbType, const char *appName, 
+nssutil_AddSecmodDB(const char *appName, 
 		   const char *filename, const char *dbname, 
 		   char *module, PRBool rw)
 {
@@ -585,7 +585,7 @@ nssutil_AddSecmodDB(NSSDBType dbType, const char *appName,
     }
 
     /* remove the previous version if it exists */
-    (void) nssutil_DeleteSecmodDB(dbType, appName, filename, 
+    (void) nssutil_DeleteSecmodDB(appName, filename, 
 				  dbname, module, rw);
 
     fd = lfopen(dbname, "a+", O_CREAT|O_RDWR|O_APPEND);
@@ -660,19 +660,19 @@ NSSUTIL_DoModuleDBFunction(unsigned long function,char *parameters, void *args)
 
     switch (function) {
     case SECMOD_MODULE_DB_FUNCTION_FIND:
-        rvstr = nssutil_ReadSecmodDB(dbType,appName,filename,
+        rvstr = nssutil_ReadSecmodDB(appName,filename,
 				     secmod,(char *)parameters,rw);
         break;
     case SECMOD_MODULE_DB_FUNCTION_ADD:
-        rvstr = (nssutil_AddSecmodDB(dbType,appName,filename,
+        rvstr = (nssutil_AddSecmodDB(appName,filename,
 		secmod,(char *)args,rw) == SECSuccess) ? &success: NULL;
         break;
     case SECMOD_MODULE_DB_FUNCTION_DEL:
-        rvstr = (nssutil_DeleteSecmodDB(dbType,appName,filename,
+        rvstr = (nssutil_DeleteSecmodDB(appName,filename,
 		secmod,(char *)args,rw) == SECSuccess) ? &success: NULL;
         break;
     case SECMOD_MODULE_DB_FUNCTION_RELEASE:
-        rvstr = (nssutil_ReleaseSecmodDBData(dbType, appName,filename,
+        rvstr = (nssutil_ReleaseSecmodDBData(appName,filename,
 		secmod, (char **)args,rw) == SECSuccess) ? &success: NULL;
         break;
     }