From f35c270131e5d8744d60492086486ba6cfa40fe3 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Wed, 8 Dec 2004 10:34:01 +0000
Subject: some very minor glitches fixed (mostly text)
---
Makefile | 6 +++---
syslogd.c | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index 4ccbf27f..abb36daf 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,8 @@
CC= gcc
#CFLAGS= -g -DSYSV -Wall
LDFLAGS= -g
-#CFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce
-CFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce -DWITH_DB
+CFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce
+#CFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce -DWITH_DB
LDFLAGS= -s
# Look where your install program is.
@@ -13,7 +13,7 @@ BINDIR = /usr/sbin
MANDIR = /usr/man
# Uncommenting the following to use mysql.
-LIBS = -lmysqlclient #/var/lib/mysql/mysql
+#LIBS = -lmysqlclient #/var/lib/mysql/mysql
# There is one report that under an all ELF system there may be a need to
# explicilty link with libresolv.a. If linking syslogd fails you may wish
diff --git a/syslogd.c b/syslogd.c
index 3a913048..16536ec9 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -2116,7 +2116,7 @@ int main(argc, argv)
StripDomains = crunch_list(optarg);
break;
case 'v':
- printf("rsyslogd %s.%s\n", VERSION, PATCHLEVEL);
+ printf("syslogd %s.%s\n", VERSION, PATCHLEVEL);
exit (0);
case '?':
default:
@@ -2431,7 +2431,7 @@ int main(argc, argv)
int usage()
{
- fprintf(stderr, "usage: rsyslogd [-drvh] [-l hostlist] [-m markinterval] [-n] [-p path]\n" \
+ fprintf(stderr, "usage: syslogd [-drvh] [-l hostlist] [-m markinterval] [-n] [-p path]\n" \
" [-s domainlist] [-f conffile]\n");
exit(1);
}
@@ -4820,7 +4820,7 @@ void initMySQL(register struct filed *f)
else
{
f->f_timeResumeOnError = 0; /* We have a working db connection */
- dprintf("connect successfully to db\n");
+ dprintf("connected successfully to db\n");
}
} while (mysql_errno(&f->f_hmysql) && iCounter<2);
}
@@ -4939,7 +4939,7 @@ void DBErrorHandler(register struct filed *f)
* a little bit longer. It also check if the DB hanlde is still valid.
* If it is necessary, it takes action to reinitiate the db connection.
*
- * \ret int Returns 0 if no error dedected.
+ * \ret int Returns 0 if successful (no error)
*/
int checkDBErrorState(register struct filed *f)
{
--
cgit