Eliminated options->silent field.

svn path=/trunk/; revision=25

1 files changed, 3 insertions, 28 deletions

diff --git a/fetchmail.c b/fetchmail.c
index 9d39d904..dc9d39cb 100644
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -96,16 +96,15 @@ char **argv;
   FILE	*tmpfp;
   pid_t pid;
 
+  if (setdefaults(&def_opts) != 0)
+    exit(PS_UNDEFINED);
+
   if ((parsestatus = parsecmdline(argc,argv,&cmd_opts)) < 0)
     exit(PS_SYNTAX);
 
-  setoutlevel(&cmd_opts);
   if (cmd_opts.versioninfo)
     showversioninfo();
 
-  if (setdefaults(&def_opts) != 0)
-    exit(PS_UNDEFINED);
-
   if (prc_parse_file(prc_getpathname(&cmd_opts,&def_opts)) != 0)
     exit(PS_SYNTAX);
 
@@ -329,30 +328,6 @@ struct optrec *options;
 	   options->limit);
 }
 
-/******************************************************************
-  function:	setoutlevel
-  description:	set output verbosity level.
-  arguments:
-    options	command-line options.
-
-  ret. value:	none.
-  globals:	writes outlevel.
-  calls:	none.
- *****************************************************************/
-
-int setoutlevel (options)
-struct optrec *options;
-{
-  if (options->verbose) 
-    outlevel = O_VERBOSE;
-  else if (options->silent)
-    outlevel = O_SILENT;
-  else
-    outlevel = O_NORMAL;
-}
-
-
-
 /*********************************************************************
   function:      openuserfolder
   description:   open the file to which the retrieved messages will