diff options
| author | Stef Walter <stef@memberwebs.com> | 2004-08-17 23:17:07 +0000 |
|---|---|---|
| committer | Stef Walter <stef@memberwebs.com> | 2004-08-17 23:17:07 +0000 |
| commit | 6df85597413840846409f7434941ed0f10ec4a38 (patch) | |
| tree | 71968501063d017ae312a2a1fc7bf470bf19a0f5 /daemon | |
| parent | 4faa3b65abad58a20c5e7e401361d30188460a83 (diff) | |
- Proper separation between common and daemon directories.
Diffstat (limited to 'daemon')
| -rw-r--r-- | daemon/httpauthd.c | 8 | ||||
| -rw-r--r-- | daemon/usuals.h | 10 |
2 files changed, 7 insertions, 11 deletions
diff --git a/daemon/httpauthd.c b/daemon/httpauthd.c index 8b8617e..ad2f365 100644 --- a/daemon/httpauthd.c +++ b/daemon/httpauthd.c @@ -619,7 +619,10 @@ static int httpauth_read(ha_request_t* rq, int ifd) r = ha_bufreadline(ifd, rq->buf); if(r == -1) + { + ha_message(rq, LOG_ERR, "error reading from socket"); return -1; + } /* Check if this is the last line */ if(r == 0) @@ -686,7 +689,10 @@ static int httpauth_read(ha_request_t* rq, int ifd) r = ha_bufreadline(ifd, rq->buf); if(r == -1) + { + ha_message(rq, LOG_ERR, "error reading from socket"); return -1; + } /* Check if this is the last line */ if(r == 0) @@ -1246,7 +1252,7 @@ static int config_parse(const char* file, ha_buffer_t* buf) ha_bufskip(buf); if((more = ha_bufreadline(fd, buf)) == -1) - return -1; + err(1, "couldn't read from configuration file: %s", file); line++; diff --git a/daemon/usuals.h b/daemon/usuals.h index b97c85d..a11d844 100644 --- a/daemon/usuals.h +++ b/daemon/usuals.h @@ -5,8 +5,6 @@ #include <sys/types.h> -#include "config.h" - #include <stdio.h> #include <stdlib.h> #include <errno.h> @@ -39,12 +37,4 @@ #define CHECK_BUF(b) (ha_buferr(b) ? (ha_memerr(NULL), 1) : 0) #define CHECK_RBUF(rq) (ha_buferr((rq)->buf) ? (ha_memerr(rq), 1) : 0) - -#ifdef _DEBUG - #include "assert.h" - #define ASSERT assert -#else - #define ASSERT -#endif - #endif /* __USUALS_H__ */ |