/[public]/psiconv/trunk/program/psiconv/psiconv.c
ViewVC logotype

Diff of /psiconv/trunk/program/psiconv/psiconv.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 244 Revision 245
… …
142 const char *extra_configfile = NULL; 142 const char *extra_configfile = NULL;
143 char *type = NULL; 143 char *type = NULL;
144 encoding encoding_type=ENCODING_UTF8; 144 encoding encoding_type=ENCODING_UTF8;
145 psiconv_list outputlist; 145 psiconv_list outputlist;
146 int verbosity = 0; 146 int verbosity = 0;
147 psiconv_config config;
147 148
148 int c,i,res; 149 int c,i,res;
149 psiconv_buffer buf; 150 psiconv_buffer buf;
150 psiconv_file file; 151 psiconv_file file;
151 fileformat ff = NULL; 152 fileformat ff = NULL;
… …
220 if (!(inputfilename = strdup(argv[optind]))) { 221 if (!(inputfilename = strdup(argv[optind]))) {
221 fputs("Out of memory error",stderr); 222 fputs("Out of memory error",stderr);
222 exit(1); 223 exit(1);
223 } 224 }
224 225
225 psiconv_config config = psiconv_config_default(); 226 config = psiconv_config_default();
226 psiconv_config_read(extra_configfile,&config); 227 psiconv_config_read(extra_configfile,&config);
227 if (verbosity) 228 if (verbosity)
228 config->verbosity = verbosity; 229 config->verbosity = verbosity;
229 230
230 /* Open inputfile for reading */ 231 /* Open inputfile for reading */
Legend:
Removed from v.244  
changed lines
  Added in v.245
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26