summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornelson%bolyard.com <devnull@localhost>2008-09-30 03:53:01 +0000
committernelson%bolyard.com <devnull@localhost>2008-09-30 03:53:01 +0000
commitcafbe1f5e2a23b10cca7bc31116c3a2d520a5b12 (patch)
tree65751364b1de9f2cc868a5b640b74008cc69e485
parent5dabfa9afca466e6115010c415ca391b15f1aa37 (diff)
downloadnss-hg-cafbe1f5e2a23b10cca7bc31116c3a2d520a5b12.tar.gz
Bug 455348: Don't use DEBUG_nelsonb. r=wtc
-rw-r--r--security/nss/cmd/selfserv/selfserv.c32
-rw-r--r--security/nss/lib/ssl/sslsnce.c3
2 files changed, 0 insertions, 35 deletions
diff --git a/security/nss/cmd/selfserv/selfserv.c b/security/nss/cmd/selfserv/selfserv.c
index ea4a68705..5402aa703 100644
--- a/security/nss/cmd/selfserv/selfserv.c
+++ b/security/nss/cmd/selfserv/selfserv.c
@@ -1766,35 +1766,6 @@ beAGoodParent(int argc, char **argv, int maxProcs, PRFileDesc * listen_sock)
exit(0);
}
-#ifdef DEBUG_nelsonb
-
-#if defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS)
-#define SSL_GETPID getpid
-#elif defined(_WIN32_WCE)
-#define SSL_GETPID GetCurrentProcessId
-#elif defined(WIN32)
-extern int __cdecl _getpid(void);
-#define SSL_GETPID _getpid
-#else
-#define SSL_GETPID() 0
-#endif
-
-void
-WaitForDebugger(void)
-{
-
- int waiting = 12;
- int myPid = SSL_GETPID();
- PRIntervalTime nrval = PR_SecondsToInterval(5);
-
- while (waiting) {
- printf("child %d is waiting to be debugged!\n", myPid);
- PR_Sleep(nrval);
- --waiting;
- }
-}
-#endif
-
#define HEXCHAR_TO_INT(c, i) \
if (((c) >= '0') && ((c) <= '9')) { \
i = (c) - '0'; \
@@ -2061,9 +2032,6 @@ main(int argc, char **argv)
if (prStatus != PR_SUCCESS)
errExit("PR_SetFDInheritable");
#endif
-#ifdef DEBUG_nelsonb
- WaitForDebugger();
-#endif
rv = SSL_InheritMPServerSIDCache(envString);
if (rv != SECSuccess)
errExit("SSL_InheritMPServerSIDCache");
diff --git a/security/nss/lib/ssl/sslsnce.c b/security/nss/lib/ssl/sslsnce.c
index 72c7009ce..6de5f428c 100644
--- a/security/nss/lib/ssl/sslsnce.c
+++ b/security/nss/lib/ssl/sslsnce.c
@@ -1179,9 +1179,6 @@ SSL_ConfigServerSessionIDCacheInstance( cacheDesc *cache,
{
SECStatus rv;
-#if defined(DEBUG_nelsonb)
- printf("sizeof(sidCacheEntry) == %u\n", sizeof(sidCacheEntry));
-#endif
PORT_Assert(sizeof(sidCacheEntry) == 192);
PORT_Assert(sizeof(certCacheEntry) == 4096);