- [ZBX-954] minor spacing fixes

34 files changed, 112 insertions, 112 deletions

diff --git a/include/alias.h b/include/alias.h
index fe43bad9a7b..a2756ec3703 100644
--- a/include/alias.h
+++ b/include/alias.h
@@ -1,4 +1,4 @@
-/* 
+/*
 ** ZABBIX
 ** Copyright (C) 2000-2005 SIA Zabbix
 **
diff --git a/include/base64.h b/include/base64.h
index 147e50b0e47..fc0234cd55a 100644
--- a/include/base64.h
+++ b/include/base64.h
@@ -1,4 +1,4 @@
-/* 
+/*
 ** ZABBIX
 ** Copyright (C) 2000-2005 SIA Zabbix
 **
diff --git a/include/cfg.h b/include/cfg.h
index baefe45bd63..49b2537deeb 100644
--- a/include/cfg.h
+++ b/include/cfg.h
@@ -1,4 +1,4 @@
-/* 
+/*
 ** ZABBIX
 ** Copyright (C) 2000-2005 SIA Zabbix
 **
diff --git a/include/common.h b/include/common.h
index 49d7e10fa5d..1dbb464e411 100644
--- a/include/common.h
+++ b/include/common.h
@@ -1,4 +1,4 @@
-/* 
+/*
 ** ZABBIX
 ** Copyright (C) 2000-2005 SIA Zabbix
 **
@@ -636,10 +636,10 @@ const char *zbx_permission_string(int perm);
 #	define MAX(a, b) ((a)>(b) ? (a) : (b))
 #endif
 
-#ifndef MIN					   
+#ifndef MIN
 #	define MIN(a, b) ((a)<(b) ? (a) : (b))
 #endif
-				    
+
 /* Secure string copy */
 #define strscpy(x,y) zbx_strlcpy(x,y,sizeof(x))
 #define strnscpy(x,y,n) zbx_strlcpy(x,y,n);
diff --git a/include/comms.h b/include/comms.h
index 3d289372364..e4ea5622c52 100644
--- a/include/comms.h
+++ b/include/comms.h
@@ -1,4 +1,4 @@
-/* 
+/*
 ** ZABBIX
 ** Copyright (C) 2000-2005 SIA Zabbix
 **
@@ -103,8 +103,8 @@ int	zbx_tcp_recv_ext(zbx_sock_t *s, char **data, unsigned char flags);
 
 char    *get_ip_by_socket(zbx_sock_t *s);
 int	zbx_tcp_check_security(
-	zbx_sock_t *s, 
-	const char *ip_list, 
+	zbx_sock_t *s,
+	const char *ip_list,
 	int allow_if_empty
 	);
 
diff --git a/include/daemon.h b/include/daemon.h
index d8a1bc066e4..c6df7c40d06 100644
--- a/include/daemon.h
+++ b/include/daemon.h
@@ -1,4 +1,4 @@
-/* 
+/*
 ** ZABBIX
 ** Copyright (C) 2000-2005 SIA Zabbix
 **
diff --git a/include/db.h b/include/db.h
index 45a1359125e..2e8aad55143 100644
--- a/include/db.h
+++ b/include/db.h
@@ -1,4 +1,4 @@
-/* 
+/*
 ** ZABBIX
 ** Copyright (C) 2000-2005 SIA Zabbix
 **
@@ -406,7 +406,7 @@ DB_ITEM
 	int	maintenance_type;
 	int	maintenance_from;
 };
- 
+
 DB_FUNCTION
 {
 	zbx_uint64_t     functionid;
diff --git a/include/dbcache.h b/include/dbcache.h
index fda56c3e3ac..fae93a57ae1 100644
--- a/include/dbcache.h
+++ b/include/dbcache.h
@@ -1,4 +1,4 @@
-/* 
+/*
 ** ZABBIX
 ** Copyright (C) 2000-2007 SIA Zabbix
 **
diff --git a/include/dbschema.h b/include/dbschema.h
index 35c17126fa5..aea64da94cc 100644
--- a/include/dbschema.h
+++ b/include/dbschema.h
@@ -1,4 +1,4 @@
-/* 
+/*
 ** ZABBIX
 ** Copyright (C) 2000-2005 SIA Zabbix
 **
diff --git a/include/email.h b/include/email.h
index 003495ee13a..ff5a335e3a9 100644
--- a/include/email.h
+++ b/include/email.h
@@ -1,4 +1,4 @@
-/* 
+/*
 ** ZABBIX
 ** Copyright (C) 2000-2005 SIA Zabbix
 **
diff --git a/include/gnuregex.h b/include/gnuregex.h
index 0e5709353f2..9b7437192b2 100644
--- a/include/gnuregex.h
+++ b/include/gnuregex.h
@@ -47,7 +47,7 @@ typedef unsigned reg_syntax_t;
 #define RE_BACKSLASH_ESCAPE_IN_LISTS (1)
 
 /* If this bit is not set, then + and ? are operators, and \+ and \? are
-     literals. 
+     literals.
    If set, then \+ and \? are operators and + and ? are literals.  */
 #define RE_BK_PLUS_QM (RE_BACKSLASH_ESCAPE_IN_LISTS << 1)
 
@@ -63,7 +63,7 @@ typedef unsigned reg_syntax_t;
         ^  is an anchor if it is at the beginning of a regular
            expression or after an open-group or an alternation operator;
         $  is an anchor if it is at the end of a regular expression, or
-           before a close-group or an alternation operator.  
+           before a close-group or an alternation operator.
 
    This bit could be (re)combined with RE_CONTEXT_INDEP_OPS, because
    POSIX draft 11.2 says that * etc. in leading positions is undefined.
@@ -74,7 +74,7 @@ typedef unsigned reg_syntax_t;
 /* If this bit is set, then special characters are always special
      regardless of where they are in the pattern.
    If this bit is not set, then special characters are special only in
-     some contexts; otherwise they are ordinary.  Specifically, 
+     some contexts; otherwise they are ordinary.  Specifically,
      * + ? and intervals are only special when not after the beginning,
      open-group, or alternation operator.  */
 #define RE_CONTEXT_INDEP_OPS (RE_CONTEXT_INDEP_ANCHORS << 1)
@@ -96,7 +96,7 @@ typedef unsigned reg_syntax_t;
 #define RE_HAT_LISTS_NOT_NEWLINE (RE_DOT_NOT_NULL << 1)
 
 /* If this bit is set, either \{...\} or {...} defines an
-     interval, depending on RE_NO_BK_BRACES. 
+     interval, depending on RE_NO_BK_BRACES.
    If not set, \{, \}, {, and } are literals.  */
 #define RE_INTERVALS (RE_HAT_LISTS_NOT_NEWLINE << 1)
 
@@ -121,7 +121,7 @@ typedef unsigned reg_syntax_t;
    If not set, then \<digit> is a back-reference.  */
 #define RE_NO_BK_REFS (RE_NO_BK_PARENS << 1)
 
-/* If this bit is set, then | is an alternation operator, and \| is literal. 
+/* If this bit is set, then | is an alternation operator, and \| is literal.
    If not set, then \| is an alternation operator, and | is literal.  */
 #define RE_NO_BK_VBAR (RE_NO_BK_REFS << 1)
 
@@ -143,7 +143,7 @@ extern reg_syntax_t re_syntax_options;
 
 /* Define combinations of the above bits for the standard possibilities.
    (The [[[ comments delimit what gets put into the Texinfo file, so
-   don't delete them!)  */ 
+   don't delete them!)  */
 /* [[[begin syntaxes]]] */
 #define RE_SYNTAX_EMACS 0
 
@@ -211,7 +211,7 @@ extern reg_syntax_t re_syntax_options;
 #undef RE_DUP_MAX
 #endif
 #ifndef RE_DUP_MAX
-# define RE_DUP_MAX ((1 << 15) - 1) 
+# define RE_DUP_MAX ((1 << 15) - 1)
 #endif
 
 
@@ -224,7 +224,7 @@ extern reg_syntax_t re_syntax_options;
 /* If this bit is set, then ignore case when matching.
    If not set, then case is significant.  */
 #define REG_ICASE (REG_EXTENDED << 1)
- 
+
 /* If this bit is set, then anchors do not match at newline
      characters in the string.
    If not set, then anchors do match at newlines.  */
@@ -263,7 +263,7 @@ typedef enum
   REG_EESCAPE,		/* Trailing backslash.  */
   REG_ESUBREG,		/* Invalid back reference.  */
   REG_EBRACK,		/* Unmatched left bracket.  */
-  REG_EPAREN,		/* Parenthesis imbalance.  */ 
+  REG_EPAREN,		/* Parenthesis imbalance.  */
   REG_EBRACE,		/* Unmatched \{.  */
   REG_BADBR,		/* Invalid contents of \{\}.  */
   REG_ERANGE,		/* Invalid range end.  */
@@ -294,7 +294,7 @@ struct re_pattern_buffer
   unsigned long allocated;
 
 	/* Number of bytes actually used in `buffer'.  */
-  unsigned long used;	
+  unsigned long used;
 
         /* Syntax setting with which the pattern was compiled.  */
   reg_syntax_t syntax;
@@ -338,7 +338,7 @@ struct re_pattern_buffer
   unsigned no_sub : 1;
 
         /* If set, a beginning-of-line anchor doesn't match at the
-           beginning of the string.  */ 
+           beginning of the string.  */
   unsigned not_bol : 1;
 
         /* Similarly for an end-of-line anchor.  */
@@ -450,7 +450,7 @@ extern int re_match
 
 
 /* Relates to `re_match' as `re_search_2' relates to `re_search'.  */
-extern int re_match_2 
+extern int re_match_2
   _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string1,
              int length1, const char *string2, int length2,
              int start, struct re_registers *regs, int stop));
diff --git a/include/ipc.h b/include/ipc.h
index 7a930809afd..fd1b62de6ae 100644
--- a/include/ipc.h
+++ b/include/ipc.h
@@ -1,4 +1,4 @@
-/* 
+/*
 ** ZABBIX
 ** Copyright (C) 2000-2009 SIA Zabbix
 **
diff --git a/include/jabber.h b/include/jabber.h
index 4e814a86040..e2999491f32 100644
--- a/include/jabber.h
+++ b/include/jabber.h
@@ -1,4 +1,4 @@
-/* 
+/*
 ** ZABBIX
 ** Copyright (C) 2000-2005 SIA Zabbix
 **
diff --git a/include/log.h b/include/log.h
index d7ff5df0184..266c37f92ff 100644
--- a/include/log.h
+++ b/include/log.h
@@ -1,4 +1,4 @@
-/* 
+/*
 ** ZABBIX
 ** Copyright (C) 2000-2005 SIA Zabbix
 **
diff --git a/include/md5.h b/include/md5.h
index 37855ebb9bc..1edd6ebcaad 100644
--- a/include/md5.h
+++ b/include/md5.h
@@ -73,7 +73,7 @@ typedef struct md5_state_s {
 } md5_state_t;
 
 #ifdef __cplusplus
-extern "C" 
+extern "C"
 {
 #endif
 
diff --git a/include/mutexs.h b/include/mutexs.h
index 707b55e225b..d24f039f84a 100644
--- a/include/mutexs.h
+++ b/include/mutexs.h
@@ -1,4 +1,4 @@
-/* 
+/*
 ** ZABBIX
 ** Copyright (C) 2000-2005 SIA Zabbix
 **
@@ -37,7 +37,7 @@
 
 #	define ZBX_MUTEX_ERROR		(-1)
 #	define ZBX_MUTEX_OK		(1)
-	
+
 #	define ZBX_MUTEX_NAME		int
 
 #	define ZBX_MUTEX_LOG		0
diff --git a/include/perfmon.h b/include/perfmon.h
index 70f6d7fec25..b9abf46e9e1 100644
--- a/include/perfmon.h
+++ b/include/perfmon.h
@@ -1,4 +1,4 @@
-/* 
+/*
 ** ZABBIX
 ** Copyright (C) 2000-2005 SIA Zabbix
 **
@@ -46,7 +46,7 @@ struct perfcounter
 {
 	struct perfcounter *next;
 	unsigned long	pdhIndex;
-	char		name[MAX_PERFCOUNTER_NAME_LEN];	
+	char		name[MAX_PERFCOUNTER_NAME_LEN];
 	/* must be caracter array! if you want to rewrite */
 	/* to dinacal memory allocation CHECK for usage   */
 	/* of sizeof function                             */
diff --git a/include/pid.h b/include/pid.h
index 635b9578aa5..ddec0ef1e49 100644
--- a/include/pid.h
+++ b/include/pid.h
@@ -1,4 +1,4 @@
-/* 
+/*
 ** ZABBIX
 ** Copyright (C) 2000-2005 SIA Zabbix
 **
diff --git a/include/service.h b/include/service.h
index 5c813f2a2e6..f76e167c925 100644
--- a/include/service.h
+++ b/include/service.h
@@ -1,4 +1,4 @@
-/* 
+/*
 ** ZABBIX
 ** Copyright (C) 2000-2005 SIA Zabbix
 **
diff --git a/include/sms.h b/include/sms.h
index 0cb97b2586c..f0aa821499a 100644
--- a/include/sms.h
+++ b/include/sms.h
@@ -1,4 +1,4 @@
-/* 
+/*
 ** ZABBIX
 ** Copyright (C) 2000-2005 SIA Zabbix
 **
diff --git a/include/snprintf.c b/include/snprintf.c
index 93dad2bbc53..df0e388e066 100644
--- a/include/snprintf.c
+++ b/include/snprintf.c
@@ -35,9 +35,9 @@
  *    original.  Also, there is now a builtin-test, just compile with:
  *           gcc -DTEST_SNPRINTF -o snprintf snprintf.c -lm
  *    and run snprintf for results.
- * 
+ *
  *  Thomas Roessler <roessler@guug.de> 01/27/98 for mutt 0.89i
- *    The PGP code was using unsigned hexadecimal formats. 
+ *    The PGP code was using unsigned hexadecimal formats.
  *    Unfortunately, unsigned formats simply didn't work.
  *
  *  Michael Elkins <me@cs.hmc.edu> 03/05/98 for mutt 0.90.8
@@ -81,7 +81,7 @@
 /* only include stdio.h if we are not re-defining snprintf or vsnprintf */
 #include <stdio.h>
  /* make the compiler happy with an empty file */
- void dummy_snprintf(void) {} 
+ void dummy_snprintf(void) {}
 #endif
 
 #ifdef HAVE_LONG_DOUBLE
@@ -118,7 +118,7 @@
 #endif
 
 #if !defined(HAVE_SNPRINTF)
-static size_t dopr(char *buffer, size_t maxlen, const char *format, 
+static size_t dopr(char *buffer, size_t maxlen, const char *format,
 		   va_list args_in);
 static void fmtstr(char *buffer, size_t *currlen, size_t maxlen,
 		    char *value, int flags, int min, int max);
@@ -177,21 +177,21 @@ static size_t dopr(char *buffer, size_t maxlen, const char *format, va_list args
 	va_list args;
 
 	VA_COPY(args, args_in);
-	
+
 	state = DP_S_DEFAULT;
 	currlen = flags = cflags = min = 0;
 	max = -1;
 	ch = *format++;
-	
+
 	while (state != DP_S_DONE) {
-		if (ch == '\0') 
+		if (ch == '\0')
 			state = DP_S_DONE;
 
 		switch(state) {
 		case DP_S_DEFAULT:
-			if (ch == '%') 
+			if (ch == '%')
 				state = DP_S_FLAGS;
-			else 
+			else
 				dopr_outch (buffer, &currlen, maxlen, ch);
 			ch = *format++;
 			break;
@@ -238,7 +238,7 @@ static size_t dopr(char *buffer, size_t maxlen, const char *format, va_list args
 			if (ch == '.') {
 				state = DP_S_MAX;
 				ch = *format++;
-			} else { 
+			} else {
 				state = DP_S_MOD;
 			}
 			break;
@@ -283,7 +283,7 @@ static size_t dopr(char *buffer, size_t maxlen, const char *format, va_list args
 			switch (ch) {
 			case 'd':
 			case 'i':
-				if (cflags == DP_C_SHORT) 
+				if (cflags == DP_C_SHORT)
 					value = va_arg (args, int);
 				else if (cflags == DP_C_LONG)
 					value = va_arg (args, long int);
@@ -414,12 +414,12 @@ static size_t dopr(char *buffer, size_t maxlen, const char *format, va_list args
 		}
 	}
 	if (maxlen != 0) {
-		if (currlen < maxlen - 1) 
+		if (currlen < maxlen - 1)
 			buffer[currlen] = '\0';
-		else if (maxlen > 0) 
+		else if (maxlen > 0)
 			buffer[maxlen - 1] = '\0';
 	}
-	
+
 	return currlen;
 }
 
@@ -438,11 +438,11 @@ static void fmtstr(char *buffer, size_t *currlen, size_t maxlen,
 
 	for (strln = 0; value[strln]; ++strln); /* strlen */
 	padlen = min - strln;
-	if (padlen < 0) 
+	if (padlen < 0)
 		padlen = 0;
-	if (flags & DP_F_MINUS) 
+	if (flags & DP_F_MINUS)
 		padlen = -padlen; /* Left Justify */
-	
+
 	while ((padlen > 0) && (cnt < max)) {
 		dopr_outch (buffer, currlen, maxlen, ' ');
 		--padlen;
@@ -471,12 +471,12 @@ static void fmtint(char *buffer, size_t *currlen, size_t maxlen,
 	int spadlen = 0; /* amount to space pad */
 	int zpadlen = 0; /* amount to zero pad */
 	int caps = 0;
-	
+
 	if (max < 0)
 		max = 0;
-	
+
 	uvalue = value;
-	
+
 	if(!(flags & DP_F_UNSIGNED)) {
 		if( value < 0 ) {
 			signvalue = '-';
@@ -488,7 +488,7 @@ static void fmtint(char *buffer, size_t *currlen, size_t maxlen,
 				signvalue = ' ';
 		}
 	}
-  
+
 	if (flags & DP_F_UP) caps = 1; /* Should characters be upper case? */
 
 	do {
@@ -508,7 +508,7 @@ static void fmtint(char *buffer, size_t *currlen, size_t maxlen,
 		zpadlen = MAX(zpadlen, spadlen);
 		spadlen = 0;
 	}
-	if (flags & DP_F_MINUS) 
+	if (flags & DP_F_MINUS)
 		spadlen = -spadlen; /* Left Justifty */
 
 #ifdef DEBUG_SNPRINTF
@@ -523,7 +523,7 @@ static void fmtint(char *buffer, size_t *currlen, size_t maxlen,
 	}
 
 	/* Sign */
-	if (signvalue) 
+	if (signvalue)
 		dopr_outch (buffer, currlen, maxlen, signvalue);
 
 	/* Zeros */
@@ -535,9 +535,9 @@ static void fmtint(char *buffer, size_t *currlen, size_t maxlen,
 	}
 
 	/* Digits */
-	while (place > 0) 
+	while (place > 0)
 		dopr_outch (buffer, currlen, maxlen, convert[--place]);
-  
+
 	/* Left Justified spaces */
 	while (spadlen < 0) {
 		dopr_outch (buffer, currlen, maxlen, ' ');
@@ -551,19 +551,19 @@ static LDOUBLE abs_val(LDOUBLE value)
 
 	if (value < 0)
 		result = -value;
-	
+
 	return result;
 }
 
 static LDOUBLE POW10(int exp)
 {
 	LDOUBLE result = 1;
-	
+
 	while (exp) {
 		result *= 10;
 		exp--;
 	}
-  
+
 	return result;
 }
 
@@ -574,7 +574,7 @@ static LLONG ROUND(LDOUBLE value)
 	intpart = (LLONG)value;
 	value = value - intpart;
 	if (value >= 0.5) intpart++;
-	
+
 	return intpart;
 }
 
@@ -607,7 +607,7 @@ static double my_modf(double x0, double *iptr)
 		ret = my_modf(x0-l*f, &i2);
 		(*iptr) = l*f + i2;
 		return ret;
-	} 
+	}
 
 	(*iptr) = l;
 	return x - (*iptr);
@@ -624,14 +624,14 @@ static void fmtfp (char *buffer, size_t *currlen, size_t maxlen,
 	int iplace = 0;
 	int fplace = 0;
 	int padlen = 0; /* amount to pad */
-	int zpadlen = 0; 
+	int zpadlen = 0;
 	int caps = 0;
 	int index;
 	double intpart;
 	double fracpart;
 	double temp;
-  
-	/* 
+
+	/*
 	 * AIX manpage says the default is 0, but Solaris says the default
 	 * is 6, and sprintf on AIX defaults to 6
 	 */
@@ -659,8 +659,8 @@ static void fmtfp (char *buffer, size_t *currlen, size_t maxlen,
 	 if (max == 0) ufvalue += 0.5; /* if max = 0 we must round */
 #endif
 
-	/* 
-	 * Sorry, we only support 16 digits past the decimal because of our 
+	/*
+	 * Sorry, we only support 16 digits past the decimal because of our
 	 * conversion method
 	 */
 	if (max > 16)
@@ -674,7 +674,7 @@ static void fmtfp (char *buffer, size_t *currlen, size_t maxlen,
 	my_modf(temp, &intpart);
 
 	fracpart = ROUND((POW10(max)) * (ufvalue - intpart));
-	
+
 	if (fracpart >= POW10(max)) {
 		intpart++;
 		fracpart -= POW10(max);
@@ -709,16 +709,16 @@ static void fmtfp (char *buffer, size_t *currlen, size_t maxlen,
 		if (fplace == 311) fplace--;
 	}
 	fconvert[fplace] = 0;
-  
+
 	/* -1 for decimal point, another -1 if we are printing a sign */
-	padlen = min - iplace - max - 1 - ((signvalue) ? 1 : 0); 
+	padlen = min - iplace - max - 1 - ((signvalue) ? 1 : 0);
 	zpadlen = max - fplace;
 	if (zpadlen < 0) zpadlen = 0;
-	if (padlen < 0) 
+	if (padlen < 0)
 		padlen = 0;
-	if (flags & DP_F_MINUS) 
+	if (flags & DP_F_MINUS)
 		padlen = -padlen; /* Left Justifty */
-	
+
 	if ((flags & DP_F_ZERO) && (padlen > 0)) {
 		if (signvalue) {
 			dopr_outch (buffer, currlen, maxlen, signvalue);
@@ -734,10 +734,10 @@ static void fmtfp (char *buffer, size_t *currlen, size_t maxlen,
 		dopr_outch (buffer, currlen, maxlen, ' ');
 		--padlen;
 	}
-	if (signvalue) 
+	if (signvalue)
 		dopr_outch (buffer, currlen, maxlen, signvalue);
-	
-	while (iplace > 0) 
+
+	while (iplace > 0)
 		dopr_outch (buffer, currlen, maxlen, iconvert[--iplace]);
 
 #ifdef DEBUG_SNPRINTF
@@ -750,13 +750,13 @@ static void fmtfp (char *buffer, size_t *currlen, size_t maxlen,
 	 */
 	if (max > 0) {
 		dopr_outch (buffer, currlen, maxlen, '.');
-		
+
 		while (zpadlen > 0) {
 			dopr_outch (buffer, currlen, maxlen, '0');
 			--zpadlen;
 		}
 
-		while (fplace > 0) 
+		while (fplace > 0)
 			dopr_outch (buffer, currlen, maxlen, fconvert[--fplace]);
 	}
 
@@ -798,7 +798,7 @@ static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c)
 {
 	size_t ret;
 	va_list ap;
-    
+
 	va_start(ap, fmt);
 	ret = vsnprintf(str, count, fmt, ap);
 	va_end(ap);
@@ -812,7 +812,7 @@ static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c)
 	va_list ap2;
 
 	VA_COPY(ap2, ap);
-	
+
 	ret = vsnprintf(NULL, 0, format, ap2);
 	if (ret <= 0) return ret;
 
@@ -833,7 +833,7 @@ static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c)
 {
 	va_list ap;
 	int ret;
-	
+
 	*ptr = NULL;
 	va_start(ap, format);
 	ret = vasprintf(ptr, format, ap);
@@ -869,7 +869,7 @@ static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c)
 		"-16.16f",
 		NULL
 	};
-	double fp_nums[] = { 6442452944.1234, -1.5, 134.21, 91340.2, 341.1234, 0203.9, 0.96, 0.996, 
+	double fp_nums[] = { 6442452944.1234, -1.5, 134.21, 91340.2, 341.1234, 0203.9, 0.96, 0.996,
 			     0.9996, 1.996, 4.136, 5.030201, 0};
 	char *int_fmt[] = {
 		"%-1.5d",
@@ -911,7 +911,7 @@ static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c)
 			int l2 = snprintf(buf1, sizeof(buf1), fp_fmt[x], fp_nums[y]);
 			sprintf (buf2, fp_fmt[x], fp_nums[y]);
 			if (strcmp (buf1, buf2)) {
-				printf("snprintf doesn't match Format: %s\n\tsnprintf = [%s]\n\t sprintf = [%s]\n", 
+				printf("snprintf doesn't match Format: %s\n\tsnprintf = [%s]\n\t sprintf = [%s]\n",
 				       fp_fmt[x], buf1, buf2);
 				fail++;
 			}
@@ -929,7 +929,7 @@ static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c)
 			int l2 = snprintf(buf1, sizeof(buf1), int_fmt[x], int_nums[y]);
 			sprintf (buf2, int_fmt[x], int_nums[y]);
 			if (strcmp (buf1, buf2)) {
-				printf("snprintf doesn't match Format: %s\n\tsnprintf = [%s]\n\t sprintf = [%s]\n", 
+				printf("snprintf doesn't match Format: %s\n\tsnprintf = [%s]\n\t sprintf = [%s]\n",
 				       int_fmt[x], buf1, buf2);
 				fail++;
 			}
@@ -947,7 +947,7 @@ static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c)
 			int l2 = snprintf(buf1, sizeof(buf1), str_fmt[x], str_vals[y]);
 			sprintf (buf2, str_fmt[x], str_vals[y]);
 			if (strcmp (buf1, buf2)) {
-				printf("snprintf doesn't match Format: %s\n\tsnprintf = [%s]\n\t sprintf = [%s]\n", 
+				printf("snprintf doesn't match Format: %s\n\tsnprintf = [%s]\n\t sprintf = [%s]\n",
 				       str_fmt[x], buf1, buf2);
 				fail++;
 			}
@@ -965,7 +965,7 @@ static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c)
 	{
 		double v0 = 0.12345678901234567890123456789012345678901;
 		for (x=0; x<100; x++) {
-			double p = pow(10, x); 
+			double p = pow(10, x);
 			double r = v0*p;
 			snprintf(buf1, sizeof(buf1), "%1.1f", r);
 			sprintf(buf2,                "%1.1f", r);
diff --git a/include/symbols.h b/include/symbols.h
index a8c334fb182..a1c45de3295 100644
--- a/include/symbols.h
+++ b/include/symbols.h
@@ -1,4 +1,4 @@
-/* 
+/*
 ** ZABBIX
 ** Copyright (C) 2000-2005 SIA Zabbix
 **
diff --git a/include/sysinc.h b/include/sysinc.h
index 317d8c86d87..1f3ca1a51d7 100644
--- a/include/sysinc.h
+++ b/include/sysinc.h
@@ -1,4 +1,4 @@
-/* 
+/*
 ** ZABBIX
 ** Copyright (C) 2000-2005 SIA Zabbix
 **
diff --git a/include/sysinfo.h b/include/sysinfo.h
index 698e8d2081a..abed4f3be15 100644
--- a/include/sysinfo.h
+++ b/include/sysinfo.h
@@ -1,4 +1,4 @@
-/* 
+/*
 ** ZABBIX
 ** Copyright (C) 2000-2005 SIA Zabbix
 **
@@ -23,7 +23,7 @@
 
 #include "common.h"
 
-/* agent return value */					 
+/* agent return value */
 typedef struct zbx_result_s {
 	int	 	type;
 	zbx_uint64_t	ui64;
@@ -60,14 +60,14 @@ typedef struct zbx_result_s {
 	{ \
 	(res)->type |= AR_STRING; \
 	(res)->str = (char*)(val); \
-	} 
+	}
 
 /* NOTE: always allocate new memory for val! DON'T USE STATIC OR STACK MEMORY!!! */
 #define SET_TEXT_RESULT(res, val) \
 	{ \
 	(res)->type |= AR_TEXT; \
 	(res)->text = (char*)(val); \
-	} 
+	}
 
 /* NOTE: always allocate new memory for val! DON'T USE STATIC OR STACK MEMORY!!! */
 #define SET_MSG_RESULT(res, val) \
diff --git a/include/threads.h b/include/threads.h
index 9d574a171d5..d6cec034b13 100644
--- a/include/threads.h
+++ b/include/threads.h
@@ -1,4 +1,4 @@
-/* 
+/*
 ** ZABBIX
 ** Copyright (C) 2000-2005 SIA Zabbix
 **
@@ -43,7 +43,7 @@
 	#define zbx_thread_kill(h) TerminateThread(h, SUCCEED);
 
 #else /* not _WINDOWS */
-	
+
 	int	zbx_fork();
 
 	#define ZBX_THREAD_ERROR (-1)
diff --git a/include/zbxdb.h b/include/zbxdb.h
index 7330effd896..08b75e8f4f0 100644
--- a/include/zbxdb.h
+++ b/include/zbxdb.h
@@ -1,4 +1,4 @@
-/* 
+/*
 ** ZABBIX
 ** Copyright (C) 2000-2005 SIA Zabbix
 **
@@ -80,7 +80,7 @@ extern sqlite3		*conn;
 void	SQ_DBfree_result(DB_RESULT result);
 
 	extern PHP_MUTEX	sqlite_access;
-	
+
 #endif
 
 #ifdef HAVE_MYSQL
diff --git a/include/zbxicmpping.h b/include/zbxicmpping.h
index d86c20ef178..8c2d844fc18 100644
--- a/include/zbxicmpping.h
+++ b/include/zbxicmpping.h
@@ -1,4 +1,4 @@
-/* 
+/*
 ** ZABBIX
 ** Copyright (C) 2000-2005 SIA Zabbix
 **
diff --git a/include/zbxjson.h b/include/zbxjson.h
index 7036312f57e..19f1f7c3e05 100644
--- a/include/zbxjson.h
+++ b/include/zbxjson.h
@@ -1,4 +1,4 @@
-/* 
+/*
 ** ZABBIX
 ** Copyright (C) 2000-2005 SIA Zabbix
 **
diff --git a/include/zbxodbc.h b/include/zbxodbc.h
index 9c3d512760c..41256360136 100644
--- a/include/zbxodbc.h
+++ b/include/zbxodbc.h
@@ -1,4 +1,4 @@
-/* 
+/*
 ** ZABBIX
 ** Copyright (C) 2000-2005 SIA Zabbix
 **
@@ -38,7 +38,7 @@ typedef struct zbx_odbc_dbh_s
 	SQLINTEGER	*data_len;
 } ZBX_ODBC_DBH;
 
-typedef ZBX_ODBC_DBH*		ZBX_ODBC_RESULT; 
+typedef ZBX_ODBC_DBH*		ZBX_ODBC_RESULT;
 
 int		odbc_DBconnect(ZBX_ODBC_DBH *pdbh, const char *db_name, const char *user, const char *pass);
 void		odbc_DBclose(ZBX_ODBC_DBH *pdbh);
diff --git a/include/zbxplugin.h b/include/zbxplugin.h
index e61516e77b1..d5e832631df 100644
--- a/include/zbxplugin.h
+++ b/include/zbxplugin.h
@@ -1,4 +1,4 @@
-/* 
+/*
 ** ZABBIX
 ** Copyright (C) 2000-2005 SIA Zabbix
 **
diff --git a/include/zbxsecurity.h b/include/zbxsecurity.h
index 66e54e7c831..51d552f78da 100644
--- a/include/zbxsecurity.h
+++ b/include/zbxsecurity.h
@@ -1,4 +1,4 @@
-/* 
+/*
 ** ZABBIX
 ** Copyright (C) 2000-2005 SIA Zabbix
 **
diff --git a/include/zbxserver.h b/include/zbxserver.h
index a9794eb5dd8..b6a7a4a93cb 100644
--- a/include/zbxserver.h
+++ b/include/zbxserver.h
@@ -1,4 +1,4 @@
-/* 
+/*
 ** ZABBIX
 ** Copyright (C) 2000-2005 SIA Zabbix
 **
@@ -41,6 +41,6 @@ void	proxy_process_new_value(DB_ITEM *item, AGENT_RESULT *value, time_t now);
 
 void	substitute_simple_macros(DB_EVENT *event, DB_ACTION *action, DB_ITEM *item, DB_ESCALATION *escalation, char **data, int macro_type);
 void	substitute_macros(DB_EVENT *event, DB_ACTION *action, DB_ESCALATION *escalation, char **data);
-	
+
 int	evaluate_expression(int *result,char **expression, DB_TRIGGER *triggger, char *error, int maxerrlen);
 #endif
diff --git a/include/zbxtypes.h b/include/zbxtypes.h
index d3fb788d8f7..7197f2f0218 100644
--- a/include/zbxtypes.h
+++ b/include/zbxtypes.h
@@ -1,4 +1,4 @@
-/* 
+/*
 ** ZABBIX
 ** Copyright (C) 2000-2005 SIA Zabbix
 **
diff --git a/include/zlog.h b/include/zlog.h
index 6e124bd9121..682b5da3272 100644
--- a/include/zlog.h
+++ b/include/zlog.h
@@ -1,4 +1,4 @@
-/* 
+/*
 ** ZABBIX
 ** Copyright (C) 2000-2005 SIA Zabbix
 **