diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-01-24 17:55:09 +0000 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-01-24 17:55:09 +0000 |
| commit | 5c686c8adcc473cbdbb14e4b2d736f9123210ee6 (patch) | |
| tree | eb83fbca0d98ac4948b6d9ca22d8a0e4828815a9 /plugins/imuxsock | |
| parent | 76782c240db52c81825c907c40c31ca8b48218de (diff) | |
| download | rsyslog-5c686c8adcc473cbdbb14e4b2d736f9123210ee6.tar.gz rsyslog-5c686c8adcc473cbdbb14e4b2d736f9123210ee6.tar.xz rsyslog-5c686c8adcc473cbdbb14e4b2d736f9123210ee6.zip | |
redesigned queue to utilize helper classes for threading support. This is
finally in a running state for regular (non disk-assisted) queues, with
a minor nit at shutdown. So I can finally commit the work again to
CVS...
Diffstat (limited to 'plugins/imuxsock')
| -rw-r--r-- | plugins/imuxsock/imuxsock.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c index 863f0d50..530bb2d4 100644 --- a/plugins/imuxsock/imuxsock.c +++ b/plugins/imuxsock/imuxsock.c @@ -170,12 +170,11 @@ static rsRetVal readSocket(int fd, int bParseHost) } else if (iRcvd < 0 && errno != EINTR) { char errStr[1024]; strerror_r(errno, errStr, sizeof(errStr)); - dbgprintf("UNIX socket error: %d = %s.\n", \ - errno, errStr); + dbgprintf("UNIX socket error: %d = %s.\n", errno, errStr); logerror("recvfrom UNIX"); } - return iRet; + RETiRet; } @@ -228,7 +227,7 @@ CODESTARTrunInput } } - return iRet; + RETiRet; ENDrunInput @@ -247,7 +246,7 @@ CODESTARTwillRun dbgprintf("Opened UNIX socket '%s' (fd %d).\n", funixn[i], funix[i]); } - return RS_RET_OK; + RETiRet; ENDwillRun |