SYSLOG: more places to correct the loglevel parameters.

[citadel.git] / webcit / serv_func.c

diff --git a/webcit/serv_func.c b/webcit/serv_func.c
index 0158ca1fbc2b6f93a19779c29cd3333f5ce277f4..a95eac70f26419b8d745ed99a2ecf3ca49469982 100644 (file)
--- a/webcit/serv_func.c
+++ b/webcit/serv_func.c
@@ -64,7 +64,7 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent)
        );
        StrBuf_ServGetln(Buf);
        if (GetServerStatus(Buf, NULL) != 2) {
-               syslog(0, "get_serv_info(IDEN): unexpected answer [%s]\n",
+               syslog(LOG_WARNING, "get_serv_info(IDEN): unexpected answer [%s]\n",
                        ChrPtr(Buf));
                FreeStrBuf(&Buf);
                return NULL;
@@ -78,7 +78,7 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent)
        serv_puts("ICAL sgi|1");
        StrBuf_ServGetln(Buf);
        if (GetServerStatus(Buf, NULL) != 2) {
-               syslog(0, "get_serv_info(ICAL sgi|1): unexpected answer [%s]\n",
+               syslog(LOG_WARNING, "get_serv_info(ICAL sgi|1): unexpected answer [%s]\n",
                        ChrPtr(Buf));
                FreeStrBuf(&Buf);
                return NULL;
@@ -88,7 +88,7 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent)
        serv_puts("INFO");
        StrBuf_ServGetln(Buf);
        if (GetServerStatus(Buf, NULL) != 1) {
-               syslog(0, "get_serv_info(INFO sgi|1): unexpected answer [%s]\n",
+               syslog(LOG_WARNING, "get_serv_info(INFO sgi|1): unexpected answer [%s]\n",
                        ChrPtr(Buf));
                FreeStrBuf(&Buf);
                return NULL;
@@ -254,55 +254,6 @@ int GetConnected (void)
        return 0;
 }
 
-/*
- *  Read Citadel variformat text and spit it out as HTML.
- *  align html align string
- */
-inline void fmout(const char *align)
-{
-       _fmout(WC->WBuf, align);
-}
-
-void _fmout(StrBuf *Target, const char *align)
-{
-       int intext = 0;
-       int bq = 0;
-       char buf[SIZ];
-
-       StrBufAppendPrintf(Target, "<div align=%s>\n", align);
-       while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-
-               if ((intext == 1) && (isspace(buf[0]))) {
-                       wc_printf("<br>");
-               }
-               intext = 1;
-
-               /*
-                * Quoted text should be displayed in italics and in a
-                * different colour.  This code understands Citadel-style
-                * " >" quotes and will convert to <BLOCKQUOTE> tags.
-                */
-               if ((bq == 0) && (!strncmp(buf, " >", 2))) {
-                       StrBufAppendBufPlain(Target, HKEY("<BLOCKQUOTE>"), 0);
-                       bq = 1;
-               } else if ((bq == 1) && (strncmp(buf, " >", 2))) {
-                       StrBufAppendBufPlain(Target, HKEY("</BLOCKQUOTE>"), 0);
-                       bq = 0;
-               }
-               if ((bq == 1) && (!strncmp(buf, " >", 2))) {
-                       strcpy(buf, &buf[2]);
-               }
-               /* Activate embedded URL's */
-               url(buf, sizeof(buf));
-
-               escputs(buf);
-               StrBufAppendBufPlain(Target, HKEY("\n"), 0);
-       }
-       if (bq == 1) {
-               wc_printf("</I>");
-       }
-       wc_printf("</div><br>\n");
-}
 
 void FmOut(StrBuf *Target, const char *align, const StrBuf *Source)
 {