From ca36b7718d40af84bd9d0bc4527135a2d0cc2855 Mon Sep 17 00:00:00 2001 From: "dougt%netscape.com" Date: Thu, 27 Sep 2001 03:52:45 +0000 Subject: [PATCH] reverting 99248. r=shaver|brendan@mozilla.org --- tools/trace-malloc/lib/nsTraceMalloc.c | 15 +-------------- xpcom/base/nsTraceMalloc.c | 15 +-------------- 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/tools/trace-malloc/lib/nsTraceMalloc.c b/tools/trace-malloc/lib/nsTraceMalloc.c index 4db408c2d19e..95af0f9bcbe6 100644 --- a/tools/trace-malloc/lib/nsTraceMalloc.c +++ b/tools/trace-malloc/lib/nsTraceMalloc.c @@ -1507,9 +1507,6 @@ PR_IMPLEMENT(int) NS_TraceMallocStartupArgs(int argc, char* argv[]) /* In child: set up stdin, parse args, and exec. */ int maxargc, nargc; char **nargv, *token; -#if HAVE_STRTOK_R - char *newstr = NULL; -#endif if (pipefds[0] != 0) { dup2(pipefds[0], 0); @@ -1517,23 +1514,13 @@ PR_IMPLEMENT(int) NS_TraceMallocStartupArgs(int argc, char* argv[]) } close(pipefds[1]); -#ifdef HAVE_STRTOK_R - tmlogname = strtok_r(tmlogname + 1, " \t", &newstr); -#else tmlogname = strtok(tmlogname + 1, " \t"); -#endif maxargc = 3; nargv = (char **) malloc((maxargc+1) * sizeof(char *)); if (!nargv) exit(1); nargc = 0; nargv[nargc++] = tmlogname; - while ( -#ifdef HAVE_STRTOK_R - (token = strtok_r(newstr, " \t", &newstr)) -#else - (token = strtok(NULL, " \t")) -#endif - != NULL) { + while ((token = strtok(NULL, " \t")) != NULL) { if (nargc == maxargc) { maxargc *= 2; nargv = (char**) diff --git a/xpcom/base/nsTraceMalloc.c b/xpcom/base/nsTraceMalloc.c index 4db408c2d19e..95af0f9bcbe6 100644 --- a/xpcom/base/nsTraceMalloc.c +++ b/xpcom/base/nsTraceMalloc.c @@ -1507,9 +1507,6 @@ PR_IMPLEMENT(int) NS_TraceMallocStartupArgs(int argc, char* argv[]) /* In child: set up stdin, parse args, and exec. */ int maxargc, nargc; char **nargv, *token; -#if HAVE_STRTOK_R - char *newstr = NULL; -#endif if (pipefds[0] != 0) { dup2(pipefds[0], 0); @@ -1517,23 +1514,13 @@ PR_IMPLEMENT(int) NS_TraceMallocStartupArgs(int argc, char* argv[]) } close(pipefds[1]); -#ifdef HAVE_STRTOK_R - tmlogname = strtok_r(tmlogname + 1, " \t", &newstr); -#else tmlogname = strtok(tmlogname + 1, " \t"); -#endif maxargc = 3; nargv = (char **) malloc((maxargc+1) * sizeof(char *)); if (!nargv) exit(1); nargc = 0; nargv[nargc++] = tmlogname; - while ( -#ifdef HAVE_STRTOK_R - (token = strtok_r(newstr, " \t", &newstr)) -#else - (token = strtok(NULL, " \t")) -#endif - != NULL) { + while ((token = strtok(NULL, " \t")) != NULL) { if (nargc == maxargc) { maxargc *= 2; nargv = (char**)