Merge branch 'v5-devel'

Conflicts:
	ChangeLog
	action.c
	plugins/imudp/imudp.c
	runtime/glbl.c

5 files changed, 10 insertions, 17 deletions

diff --git a/tools/omfile.c b/tools/omfile.c
index 3a74550b..435424a9 100644
--- a/tools/omfile.c
+++ b/tools/omfile.c
@@ -416,7 +416,6 @@ prepareFile(instanceData *pData, uchar *newFileName)
 		}
 	} else {
 		/* file does not exist, create it (and eventually parent directories */
-		fd = -1;
 		if(pData->bCreateDirs) {
 			/* We first need to create parent dirs if they are missing.
 			 * We do not report any errors here ourselfs but let the code
diff --git a/tools/omfwd.c b/tools/omfwd.c
index 6a42292d..fb9c9217 100644
--- a/tools/omfwd.c
+++ b/tools/omfwd.c
@@ -532,7 +532,6 @@ finalize_it:
 BEGINparseSelectorAct
 	uchar *q;
 	int i;
-	int bErr;
 	rsRetVal localRet;
         struct addrinfo;
 	TCPFRAMINGMODE tcp_framing = TCP_FRAMING_OCTET_STUFFING;
@@ -655,7 +654,6 @@ CODE_STD_STRING_REQUESTparseSelectorAct(1)
 	}
 	
 	/* now skip to template */
-	bErr = 0;
 	while(*p && *p != ';'  && *p != '#' && !isspace((int) *p))
 		++p; /*JUST SKIP*/
 
diff --git a/tools/omusrmsg.c b/tools/omusrmsg.c
index 10b26e37..c5a28a09 100644
--- a/tools/omusrmsg.c
+++ b/tools/omusrmsg.c
@@ -259,7 +259,6 @@ static rsRetVal wallmsg(uchar* pMsg, instanceData *pData)
 				}
 			}
 			close(ttyf);
-			ttyf = -1;
 		}
 	}
 
diff --git a/tools/rsyslog.conf.5 b/tools/rsyslog.conf.5
index e8a4ab92..e17da974 100644
--- a/tools/rsyslog.conf.5
+++ b/tools/rsyslog.conf.5
@@ -200,11 +200,11 @@ to overwrite the preceding ones. Using this behavior you can exclude some
 priorities from the pattern.
 
 Rsyslogd has a syntax extension to the original BSD source, that makes its use
-more intuitively. You may precede every priority with an equation sign ('=') to
+more intuitively. You may precede every priority with an equals sign ('=') to
 specify only this single priority and not any of the above. You may also (both
 is valid, too) precede the priority with an exclamation mark ('!') to ignore
 all that priorities, either exact this one or this and any higher priority. If
-you use both extensions than the exclamation mark must occur before the equation
+you use both extensions than the exclamation mark must occur before the equals
 sign, just use it intuitively.
 
 .SH ACTIONS
diff --git a/tools/syslogd.c b/tools/syslogd.c
index 53da16d8..36b48bde 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -2106,11 +2106,6 @@ static void printVersion(void)
 #else
 	printf("\tFEATURE_LARGEFILE:\t\t\tNo\n");
 #endif
-#ifdef	USE_NETZIP
-	printf("\tFEATURE_NETZIP (message compression):\tYes\n");
-#else
-	printf("\tFEATURE_NETZIP (message compression):\tNo\n");
-#endif
 #if defined(SYSLOG_INET) && defined(USE_GSSAPI)
 	printf("\tGSSAPI Kerberos 5 support:\t\tYes\n");
 #else
@@ -2122,9 +2117,14 @@ static void printVersion(void)
 	printf("\tFEATURE_DEBUG (debug build, slow code):\tNo\n");
 #endif
 #ifdef	HAVE_ATOMIC_BUILTINS
-	printf("\tAtomic operations supported:\t\tYes\n");
+	printf("\t32bit Atomic operations supported:\tYes\n");
 #else
-	printf("\tAtomic operations supported:\t\tNo\n");
+	printf("\t32bit Atomic operations supported:\tNo\n");
+#endif
+#ifdef	HAVE_ATOMIC_BUILTINS64
+	printf("\t64bit Atomic operations supported:\tYes\n");
+#else
+	printf("\t64bit Atomic operations supported:\tNo\n");
 #endif
 #ifdef	RTINST
 	printf("\tRuntime Instrumentation (slow code):\tYes\n");
@@ -2587,7 +2587,7 @@ int realMain(int argc, char **argv)
 		}
 	}
 
-	if ((argc -= optind))
+	if(argc - optind)
 		usage();
 
 	DBGPRINTF("rsyslogd %s startup, compatibility mode %d, module path '%s', cwd:%s\n",
@@ -2863,9 +2863,6 @@ int realMain(int argc, char **argv)
 	if(!iConfigVerify)
 		CHKiRet(doGlblProcessInit());
 
-	/* re-generate local host name property, as the config may have changed our FQDN settings */
-	glbl.GenerateLocalHostNameProperty();
-
 	CHKiRet(mainThread());
 
 	/* do any de-init's that need to be done AFTER this comment */