diff options
| author | Niall O'Higgins <niallo@cvs.openbsd.org> | 2005-06-15 00:00:17 +0000 |
|---|---|---|
| committer | Niall O'Higgins <niallo@cvs.openbsd.org> | 2005-06-15 00:00:17 +0000 |
| commit | b966fc4f5c10dab26b2140740660743ff0cc4429 (patch) | |
| tree | da3bf6318a91221e8fb6f6930eda04e9441fa9bb /usr.sbin | |
| parent | 59a2d2c9eab631fc331e1857eb183d2203358dcc (diff) | |
zap usage of __LINE__ so we can do KNF without binary changes.
ok henning@
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/httpd/src/ap/ap_hook.c | 2 | ||||
| -rw-r--r-- | usr.sbin/httpd/src/include/http_log.h | 4 | ||||
| -rw-r--r-- | usr.sbin/httpd/src/include/httpd.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/httpd/src/ap/ap_hook.c b/usr.sbin/httpd/src/ap/ap_hook.c index 8f2359df4ae..dab70912d0b 100644 --- a/usr.sbin/httpd/src/ap/ap_hook.c +++ b/usr.sbin/httpd/src/ap/ap_hook.c @@ -796,7 +796,7 @@ static int ap_hook_call_func(va_list ap, ap_hook_entry *he, ap_hook_func *hf) } /* ----END GENERATED SECTION---------- */ else - ap_log_assert("hook signature not implemented", __FILE__, __LINE__); + ap_log_assert("hook signature not implemented", __FILE__, 0); if (he->he_modeid == AP_HOOK_MODE_ALL) rc = FALSE; diff --git a/usr.sbin/httpd/src/include/http_log.h b/usr.sbin/httpd/src/include/http_log.h index 9c280047907..f6fb9065700 100644 --- a/usr.sbin/httpd/src/include/http_log.h +++ b/usr.sbin/httpd/src/include/http_log.h @@ -1,4 +1,4 @@ -/* $OpenBSD: http_log.h,v 1.10 2005/03/28 23:26:51 niallo Exp $ */ +/* $OpenBSD: http_log.h,v 1.11 2005/06/15 00:00:16 niallo Exp $ */ /* ==================================================================== * The Apache Software License, Version 1.1 @@ -84,7 +84,7 @@ extern "C" { #define DEFAULT_LOGLEVEL APLOG_WARNING #endif -#define APLOG_MARK __FILE__,__LINE__ +#define APLOG_MARK __FILE__,0 API_EXPORT(void) ap_open_logs (server_rec *, pool *p); diff --git a/usr.sbin/httpd/src/include/httpd.h b/usr.sbin/httpd/src/include/httpd.h index 2a6d4b0d5c9..738d7cc3274 100644 --- a/usr.sbin/httpd/src/include/httpd.h +++ b/usr.sbin/httpd/src/include/httpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: httpd.h,v 1.25 2005/03/28 23:26:51 niallo Exp $ */ +/* $OpenBSD: httpd.h,v 1.26 2005/06/15 00:00:16 niallo Exp $ */ /* ==================================================================== * The Apache Software License, Version 1.1 @@ -1117,7 +1117,7 @@ API_EXPORT(char *) ap_escape_quotes(pool *p, const char *instr); */ API_EXPORT(void) ap_log_assert(const char *szExp, const char *szFile, int nLine) __attribute__((noreturn)); -#define ap_assert(exp) ((exp) ? (void)0 : ap_log_assert(#exp,__FILE__,__LINE__)) +#define ap_assert(exp) ((exp) ? (void)0 : ap_log_assert(#exp,__FILE__,0)) #define OPTIMIZE_TIMEOUTS |