--- psiconv/trunk/program/psiconv/psiconv.c	2000/10/21 00:49:13	53
+++ psiconv/trunk/program/psiconv/psiconv.c	2000/12/15 01:16:43	65
@@ -36,8 +36,8 @@
 #include <magick/magick.h>
 #endif
 
-#include "data.h"
-#include "parse.h"
+#include "psiconv/data.h"
+#include "psiconv/parse.h"
 #include "gen.h"
 #include "psiconv.h"
 
@@ -45,8 +45,6 @@
 static void print_version(void);
 static void strtoupper(char *str);
 
-int psiconv_verbosity = PSICONV_VERB_WARN;
-
 void print_help(void)
 {
   psiconv_fileformat ff;
@@ -115,7 +113,9 @@
   psiconv_file file;
   psiconv_fileformat ff;
 
-  fileformat_list = psiconv_list_new(sizeof(struct psiconv_fileformat));
+  psiconv_verbosity = PSICONV_VERB_WARN;
+
+  fileformat_list = psiconv_list_new(sizeof(struct psiconv_fileformat_s));
   init_txt();
   init_html();
   init_html4();
@@ -133,7 +133,7 @@
                   psiconv_verbosity = PSICONV_VERB_PROGRESS; 
                 break;
       case 'd': psiconv_verbosity = PSICONV_VERB_DEBUG; break;
-      case 's': psiconv_verbosity = PSICONV_VERB_SILENT; break;
+      case 's': psiconv_verbosity = PSICONV_VERB_FATAL; break;
       case 'e': exact = 1; break;
       case 'o': outputfilename = strdup(optarg); break;
       case 'T': type = strdup(optarg); break;
@@ -151,6 +151,7 @@
   } else if (optind == argc-1) 
     inputfilename = strdup(argv[optind]);
 
+
   /* Open inputfile for reading */
     
   if (strlen(inputfilename) != 0) {