From: Art Cancro Date: Thu, 14 Dec 2006 20:27:18 +0000 (+0000) Subject: Cleaned up some commented-out stuff that was left in various files X-Git-Tag: v7.86~3797 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=f832fbfe8bfff280b1a6ea642d4be0d7472eeb17 Cleaned up some commented-out stuff that was left in various files --- diff --git a/webcit/html2html.c b/webcit/html2html.c index abd5904e8..8799aaa2a 100644 --- a/webcit/html2html.c +++ b/webcit/html2html.c @@ -255,8 +255,10 @@ void output_html(char *supplied_charset, int treat_as_wiki) { converted_alloc = content_length + 8192; converted_msg = malloc(converted_alloc); if (converted_msg == NULL) { - abort(); /* FIXME */ + wprintf("Error %d: %s
%s:%s", errno, strerror(errno), __FILE__, __LINE__); + goto BAIL; } + strcpy(converted_msg, ""); ptr = msg; msgend = strchr(msg, 0); @@ -392,7 +394,7 @@ void output_html(char *supplied_charset, int treat_as_wiki) { /** Output our big pile of markup */ client_write(converted_msg, output_length); - /** A little trailing vertical whitespace... */ +BAIL: /** A little trailing vertical whitespace... */ wprintf("

\n"); /** Now give back the memory */ diff --git a/webcit/static/wclib.js b/webcit/static/wclib.js index fbe50fde5..96d472feb 100644 --- a/webcit/static/wclib.js +++ b/webcit/static/wclib.js @@ -625,7 +625,7 @@ fwindow.parentNode.removeChild(fwindow); // Place a gradient loadscreen on an element, e.g to use before Ajax.updater function CtdlLoadScreen(elementid) { var elem = document.getElementById(elementid); -elem.innerHTML = "Loading.... "; +elem.innerHTML = "

Loading....
"; } // Show info for a user, basically replaces showuser() // matt@comalies is to blame for this poorly coded masterpiece.