summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-05-25 16:25:53 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-05-25 16:25:53 +0200
commit210f43137d6a077abbd8b77c1f72193dcd81cc99 (patch)
treeeb276f8d5ead42f0ae6472188ca4503c908c9caa
parentde51fab0ff9647954fe6540ee77252e9ea317888 (diff)
downloadrsyslog-210f43137d6a077abbd8b77c1f72193dcd81cc99.tar.gz
rsyslog-210f43137d6a077abbd8b77c1f72193dcd81cc99.tar.xz
rsyslog-210f43137d6a077abbd8b77c1f72193dcd81cc99.zip
fixing some minor nits
-rw-r--r--tests/ourtail.c2
-rw-r--r--tools/omfile.c6
-rw-r--r--tools/syslogd.c1
3 files changed, 5 insertions, 4 deletions
diff --git a/tests/ourtail.c b/tests/ourtail.c
index f2751c72..6781b5fe 100644
--- a/tests/ourtail.c
+++ b/tests/ourtail.c
@@ -28,7 +28,7 @@
*/
#include <stdio.h>
-int main(int argc, char *argv[])
+int main(int __attribute__((unused)) argc, char __attribute__((unused)) *argv[])
{
int c;
diff --git a/tools/omfile.c b/tools/omfile.c
index c7283e4d..3e845a73 100644
--- a/tools/omfile.c
+++ b/tools/omfile.c
@@ -132,7 +132,7 @@ ENDisCompatibleWithFeature
BEGINdbgPrintInstInfo
CODESTARTdbgPrintInstInfo
if(pData->bDynamicName) {
- printf("[dynamic]\n\ttemplate='%s'"
+ dbgprintf("[dynamic]\n\ttemplate='%s'"
"\tfile cache size=%d\n"
"\tcreate directories: %s\n"
"\tfile owner %d, group %d\n"
@@ -146,9 +146,9 @@ CODESTARTdbgPrintInstInfo
pData->bFailOnChown ? "yes" : "no"
);
} else { /* regular file */
- printf("%s", pData->f_fname);
+ dbgprintf("%s", pData->f_fname);
if (pData->fd == -1)
- printf(" (unused)");
+ dbgprintf(" (unused)");
}
ENDdbgPrintInstInfo
diff --git a/tools/syslogd.c b/tools/syslogd.c
index e207b5b2..31cc4a4d 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -1950,6 +1950,7 @@ static void doDie(int sig)
# define MSG1 "DoDie called.\n"
# define MSG2 "DoDie called 5 times - unconditional exit\n"
static int iRetries = 0; /* debug aid */
+ dbgprintf(MSG1);
if(Debug)
write(1, MSG1, sizeof(MSG1) - 1);
if(iRetries++ == 4) {