0714ad987fb4018da001e4ec75a9288207f902cf angie Fri Mar 1 14:14:45 2019 -0800 Revert "When hgTables gets multiple search results, hgFind calls webEnd and then hgTables needs to do cartWebEnd, so jsInlineFinish is called twice. Until the webStart/webEnd can be factored out of hgFind.c, prevent the jsInlineFinish warning from bothering the user. refs #22945" webStart/webEnd has been factored out of hgFind, so hgTables can open and close the page cleanly and there's no warning to hide from the user. This reverts commit ee3659b05d0af22a52207792b8deaf836a727fe5. diff --git src/lib/cheapcgi.c src/lib/cheapcgi.c index 6407807..a1186e1 100644 --- src/lib/cheapcgi.c +++ src/lib/cheapcgi.c @@ -49,32 +49,31 @@ jsInlineInit(); // init if needed va_list args; va_start(args, format); dyStringVaPrintf(jsInlineLines, format, args); va_end(args); } boolean jsInlineFinishCalled = FALSE; void jsInlineFinish() /* finish outputting accumulated inline javascript */ { if (jsInlineFinishCalled) { // jsInlineFinish can be called multiple times when generating framesets or genomeSpace. - // Log to stderr instead of bothering user, at least until work on #22945 is complete. - fprintf(stderr, "jsInlineFinish() called already."); + warn("jsInlineFinish() called already."); } jsInlineInit(); // init if needed printf("\n", getNonce(), jsInlineLines->string); dyStringClear(jsInlineLines); jsInlineFinishCalled = TRUE; } void jsInlineReset() /* used by genomeSpace to repeatedly output multiple pages to stdout */ { jsInlineFinishCalled = FALSE; } const char * const jsEvents[] = { "abort",