Cleaned up some commented-out stuff that was left in various files

[citadel.git] / webcit / html2html.c

diff --git a/webcit/html2html.c b/webcit/html2html.c
index abd5904e846a1577fa6c2af0c5a2d3fa3e72eed6..8799aaa2a3d6a2d85a61b511ebc7b7927338abc0 100644 (file)
--- 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<br />%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("<br /><br />\n");
 
        /** Now give back the memory */