diff options
| author | Otto Moerbeek <otto@cvs.openbsd.org> | 2006-02-11 19:15:58 +0000 |
|---|---|---|
| committer | Otto Moerbeek <otto@cvs.openbsd.org> | 2006-02-11 19:15:58 +0000 |
| commit | bef02d1276eb64fa1ac891c0d08cd4fa9e66353d (patch) | |
| tree | 4bad7ecbb662ff370ef857dd7822f5cd88100984 | |
| parent | 46c83d7fa2519213e2c2ba13922a5eec85c36b2b (diff) | |
Fix a few "discards qualifier" warnings. From A. Farber in PR 5114.
ok kettenis@
| -rw-r--r-- | usr.sbin/httpd/src/main/http_main.c | 4 | ||||
| -rw-r--r-- | usr.sbin/httpd/src/main/http_protocol.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/httpd/src/main/http_main.c b/usr.sbin/httpd/src/main/http_main.c index af0551a3807..c53ab9abdbb 100644 --- a/usr.sbin/httpd/src/main/http_main.c +++ b/usr.sbin/httpd/src/main/http_main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: http_main.c,v 1.39 2005/05/03 05:44:35 djm Exp $ */ +/* $OpenBSD: http_main.c,v 1.40 2006/02/11 19:15:57 otto Exp $ */ /* ==================================================================== * The Apache Software License, Version 1.1 @@ -3078,7 +3078,7 @@ static void standalone_main(int argc, char **argv) /* cleanup pid file on normal shutdown */ { - const char *pidfile = NULL; + char *pidfile = NULL; pidfile = ap_server_root_relative (pconf, ap_pid_fname); ap_server_strip_chroot(pidfile, 0); if ( pidfile != NULL && unlink(pidfile) == 0) diff --git a/usr.sbin/httpd/src/main/http_protocol.c b/usr.sbin/httpd/src/main/http_protocol.c index e4974dae94b..7cb0c6683e4 100644 --- a/usr.sbin/httpd/src/main/http_protocol.c +++ b/usr.sbin/httpd/src/main/http_protocol.c @@ -1,4 +1,4 @@ -/* $OpenBSD: http_protocol.c,v 1.29 2005/11/11 15:09:54 cloder Exp $ */ +/* $OpenBSD: http_protocol.c,v 1.30 2006/02/11 19:15:57 otto Exp $ */ /* ==================================================================== * The Apache Software License, Version 1.1 * @@ -3029,7 +3029,7 @@ int ap_create_etag_state(pool *pconf) u_int32_t rnd; unsigned int u; int fd; - const char* filename; + char* filename; filename = ap_server_root_relative(pconf, "logs/etag-state"); ap_server_strip_chroot(filename, 0); @@ -3067,7 +3067,7 @@ int ap_read_etag_state(pool *pconf) u_int32_t rnd; unsigned int u; int fd; - const char* filename; + char* filename; ap_SHA1Init(&baseCtx); |