diff options
author | relyea%netscape.com <devnull@localhost> | 2003-01-28 16:39:32 +0000 |
---|---|---|
committer | relyea%netscape.com <devnull@localhost> | 2003-01-28 16:39:32 +0000 |
commit | d1401425021ac1c2ec1d8450b154f4eaa6c1946f (patch) | |
tree | e1316a8ad08dc53d589f76957ac224da1e0d4616 /security/nss/lib | |
parent | 7563b5ed9036d7ccaaea3827cceb730d6ca3b4d0 (diff) | |
download | nss-hg-d1401425021ac1c2ec1d8450b154f4eaa6c1946f.tar.gz |
Remove dead code and symbols from lib jar so that modutil can compile when
linked with it.
Diffstat (limited to 'security/nss/lib')
-rw-r--r-- | security/nss/lib/jar/jarevil.c | 2 | ||||
-rw-r--r-- | security/nss/lib/jar/jarver.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/security/nss/lib/jar/jarevil.c b/security/nss/lib/jar/jarevil.c index cced82b7d..7b2dbfebe 100644 --- a/security/nss/lib/jar/jarevil.c +++ b/security/nss/lib/jar/jarevil.c @@ -342,7 +342,7 @@ PR_STATIC_CALLBACK(void) jar_moz_perm_fn (void *data) PORT_SetError (perm_data->error); - status = CERT_AddTempCertToPerm (perm_data->cert, perm_data->nickname, perm_data->trust); + status = __CERT_AddTempCertToPerm (perm_data->cert, perm_data->nickname, perm_data->trust); perm_data->status = status; perm_data->error = PORT_GetError(); diff --git a/security/nss/lib/jar/jarver.c b/security/nss/lib/jar/jarver.c index be974a1dd..c2384284c 100644 --- a/security/nss/lib/jar/jarver.c +++ b/security/nss/lib/jar/jarver.c @@ -1407,8 +1407,11 @@ char *JAR_cert_html if (cert == NULL || *result < 0) return NULL; - *result = 0; + *result = -1; + + return NULL; +#ifdef notdef html = CERT_HTMLCertInfo (cert, /* show images */ PR_TRUE, /*show issuer*/PR_TRUE); @@ -1416,6 +1419,7 @@ char *JAR_cert_html *result = -1; return html; +#endif } /* |