--- psiconv/trunk/lib/psiconv/parse_formula.c	2004/01/04 22:20:43	183
+++ psiconv/trunk/lib/psiconv/parse_formula.c	2004/01/06 20:15:01	184
@@ -437,7 +437,7 @@
     len ++;
 
     if (formula_elements[marker].formula_type == psiconv_formula_unknown) {
-      psiconv_warn(config,lev+3,off+len,"Unknown formula marker found!");
+      psiconv_error(config,lev+3,off+len,"Unknown formula marker found!");
       goto ERROR8;
     } else if ((formula_elements[marker].formula_type == 
                                                 psiconv_formula_mark_eof) ||
@@ -561,7 +561,7 @@
       }
       if (formula_elements[submarker].formula_type 
                                              != psiconv_formula_mark_opend) {
-        psiconv_warn(config,lev+3,off+len,"Formula corrupted!");
+        psiconv_error(config,lev+3,off+len,"Formula corrupted!");
         psiconv_debug(config,lev+3,off+len,"Found unexpected marker %02x",submarker);
         goto ERROR8;
       }
@@ -571,7 +571,7 @@
       if (res)
         goto ERROR8;
       if (submarker != marker) {
-        psiconv_warn(config,lev+3,off+len,"Formula corrupted!");
+        psiconv_error(config,lev+3,off+len,"Formula corrupted!");
         psiconv_debug(config,lev+3,off+len,"Expected marker %02x, found %02x",
                       marker,submarker);
         goto ERROR8;
@@ -584,7 +584,7 @@
       if (res)
         goto ERROR8;
       if (temp != nr_of_subs) {
-        psiconv_warn(config,lev+3,off+len,"Formula corrupted!");
+        psiconv_error(config,lev+3,off+len,"Formula corrupted!");
         psiconv_debug(config,lev+3,off+len,
                       "Read %d arguments, but formula says there are %d",
                       nr_of_subs,temp);
@@ -630,13 +630,13 @@
     }
   }
   if ((len+off > maxlen) || !eof) {
-    psiconv_warn(config,lev+2,off+len,"Formula corrupted!");
+    psiconv_error(config,lev+2,off+len,"Formula corrupted!");
     psiconv_debug(config,lev+2,off+len,"Expected end: %04x, found end: %04x",
                   maxlen,len+off);
     goto ERROR8;
   }
   if ((psiconv_list_length(formula_stack)) != 1) {
-    psiconv_warn(config,lev+2,off+len,"Formula corrupted!");
+    psiconv_error(config,lev+2,off+len,"Formula corrupted!");
     psiconv_debug(config,lev+2,off+len,"More than one item left on the stack (%d)",
                    psiconv_list_length(formula_stack));
     goto ERROR8;
@@ -668,7 +668,7 @@
 ERROR2:
   free (*result);
 ERROR1:
-  psiconv_warn(config,lev+1,off,"Reading of formula element list failed");
+  psiconv_error(config,lev+1,off,"Reading of formula element list failed");
   if (length)
     *length = 0;
    if (!res)
@@ -714,7 +714,7 @@
   if (res)
     goto ERROR2;
   if (formula_elements[temp].formula_type != psiconv_formula_mark_eof) {
-    psiconv_warn(config,lev+2,off+len,"Formula corrupted!");
+    psiconv_error(config,lev+2,off+len,"Formula corrupted!");
     psiconv_debug(config,lev+2,off+len,"Expected marker: %02x, found byte: %02x",
                   0x15,temp);
     goto ERROR2;
@@ -722,7 +722,7 @@
   len ++;
 
   if (off+len != formula_end) {
-    psiconv_warn(config,lev+2,off+len,"Formula corrupted!");
+    psiconv_error(config,lev+2,off+len,"Formula corrupted!");
     psiconv_debug(config,lev+2,off+len,"Expected end: %04x, found end: %04x",
                   formula_end,len+off);
     goto ERROR2;
@@ -738,7 +738,7 @@
 ERROR2:
   psiconv_free_formula(*result);
 ERROR1:
-  psiconv_warn(config,lev+1,off,"Reading of formula failed");
+  psiconv_error(config,lev+1,off,"Reading of formula failed");
   if (length)
     *length = 0;
    if (!res)