summaryrefslogtreecommitdiffstats
path: root/syslogd.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2007-07-18 10:36:36 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2007-07-18 10:36:36 +0000
commit7a2eb66a0a0fde6ed263a035eb2eeeba483c604b (patch)
treea3e4911ddba7ff7faff50f00208d5663a76999e9 /syslogd.c
parent95c21c07dae3e8d8ab888a71b10c738506b4e354 (diff)
downloadrsyslog-7a2eb66a0a0fde6ed263a035eb2eeeba483c604b.tar.gz
rsyslog-7a2eb66a0a0fde6ed263a035eb2eeeba483c604b.tar.xz
rsyslog-7a2eb66a0a0fde6ed263a035eb2eeeba483c604b.zip
applied cleanup patch by Peter Vrabec
Diffstat (limited to 'syslogd.c')
-rw-r--r--syslogd.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/syslogd.c b/syslogd.c
index 4109f52e..2c05b0cc 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -888,7 +888,7 @@ static rsRetVal AddAllowedSenderEntry(struct AllowedSenders **ppRoot, struct All
static rsRetVal AddAllowedSender(struct AllowedSenders **ppRoot, struct AllowedSenders **ppLast,
struct NetAddr *iAllow, uint8_t iSignificantBits)
{
- rsRetVal iRet;
+ rsRetVal iRet = RS_RET_OK;
assert(ppRoot != NULL);
assert(ppLast != NULL);
@@ -1572,7 +1572,7 @@ static void TCPSessAccept(int fd)
int iSess;
struct sockaddr_storage addr;
socklen_t addrlen = sizeof(struct sockaddr_storage);
- int lenHostName;
+ size_t lenHostName;
uchar fromHost[NI_MAXHOST];
uchar fromHostFQDN[NI_MAXHOST];
char *pBuf;
@@ -7453,7 +7453,6 @@ static int doParseOnOffOption(uchar **pp)
{
char *pOptStart;
uchar szOpt[32];
- int iRet = -1;
assert(pp != NULL);
assert(*pp != NULL);
@@ -7463,7 +7462,7 @@ static int doParseOnOffOption(uchar **pp)
if(getSubString(pp, (char*) szOpt, sizeof(szOpt) / sizeof(uchar), ' ') != 0) {
logerror("Invalid $-configline - could not extract on/off option");
- return;
+ return -1;
}
if(!strcmp(szOpt, "on")) {
@@ -8922,12 +8921,11 @@ static rsRetVal cfline(char *line, register selector_t *f)
f->f_un.f_forw.port = NULL;
if(*p == ':') { /* process port */
- register int i = 0;
uchar * tmp;
*p = '\0'; /* trick to obtain hostname (later)! */
tmp = ++p;
- for( ; *p && isdigit((int) *p) ; ++p, ++i)
+ for(i=0 ; *p && isdigit((int) *p) ; ++p, ++i)
/* SKIP AND COUNT */;
f->f_un.f_forw.port = malloc(i + 1);
if(f->f_un.f_forw.port == NULL) {