masqmail-0.2

diff src/log.c @ 15:f671821d8222

find changesets by author, revision, files, or words in the commit message
code beautifying; 0 -> \0 if appropriate
author meillo@marmaro.de
date Thu, 06 Nov 2008 09:18:38 +0100
parents 26e34ae9a3e3
children b3835b6b834b
line diff
     1.1 --- a/src/log.c	Wed Oct 29 21:21:26 2008 +0100
     1.2 +++ b/src/log.c	Thu Nov 06 09:18:38 2008 +0100
     1.3 @@ -16,10 +16,10 @@
     1.4      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
     1.5  */
     1.6  
     1.7 +#include <sysexits.h>
     1.8 +
     1.9  #include "masqmail.h"
    1.10  
    1.11 -#include "sysexits.h"
    1.12 -
    1.13  static char *_sysexit_strings[] = {
    1.14  	"command line usage error",
    1.15  	"data format error",
    1.16 @@ -109,8 +109,7 @@
    1.17  void
    1.18  vlogwrite(int pri, const char *fmt, va_list args)
    1.19  {
    1.20 -	if ((conf.do_verbose && (pri & LOG_VERBOSE)) || (pri == LOG_ALERT)
    1.21 -		|| (pri == LOG_WARNING)) {
    1.22 +	if ((conf.do_verbose && (pri & LOG_VERBOSE)) || (pri == LOG_ALERT) || (pri == LOG_WARNING)) {
    1.23  		va_list args_copy;
    1.24  		va_copy(args_copy, args);
    1.25  		vfprintf(stdout, fmt, args_copy);
    1.26 @@ -120,7 +119,6 @@
    1.27  
    1.28  	pri &= ~LOG_VERBOSE;
    1.29  	if (pri) {
    1.30 -
    1.31  		if (conf.use_syslog)
    1.32  			vsyslog(pri, fmt, args);
    1.33  		else {
    1.34 @@ -159,7 +157,6 @@
    1.35  
    1.36  	if (debugfile) {
    1.37  		fprintf(debugfile, "%s [%d] ", buf, getpid());
    1.38 -
    1.39  		vfprintf(debugfile, fmt, args);
    1.40  		fflush(debugfile);
    1.41  	} else {