]> granicus.if.org Git - apache/commit
Move the POSIX reg* implementations into the ap_* namespace;
authorJoe Orton <jorton@apache.org>
Fri, 11 Feb 2005 12:00:41 +0000 (12:00 +0000)
committerJoe Orton <jorton@apache.org>
Fri, 11 Feb 2005 12:00:41 +0000 (12:00 +0000)
commita0570c8746d04d82b724932cdb9c96240cf3329d
tree5597985b65498e809de32f0ff3ba710d70936fb2
parentc2f37c7a4db5fa2018de24c08aa32821e46af03d
Move the POSIX reg* implementations into the ap_* namespace;
internalise the ap_reg*<->PCRE wrapper:

* configure.in: Add srclib/pcre to the include path.

* include/ap_regex.h: Renamed from include/pcreposix.h.  Prefix all
constants with AP_; prefix all functions and types with ap_.  Define
AP_DECLARE to nothing if necessary.  Remove regcomp error codes.

* include/httpd.h: Include ap_regex.h not pcreposix.h.
(ap_pregcomp, ap_regexec, ap_regfree): s/regex_t/ap_regex_t/.
(ap_regexec, ap_regerror): Prototypes moved to ap_regex.h.

* server/util.c (regex_cleanup, ap_pregcomp, ap_pregsub, ap_pregfree):
Adjust for ap_ prefixed types.  (ap_regexec, ap_regerror): Removed.

* server/Makefile.in: Build util_pcre.c.

* server/util_pcre.c: Copied from srclib/pcre/pcreposix.c; remove use
of PCRE-internals to do error mapping; rename types to add AP_/ap_
prefixes as above.  Use APR includes.  (ap_regerror): Use apr_snprintf.

* srclib/pcre/Makefile.in: Don't build pcreposix.c into libpcre.la.

* modules/*: Update to use new type and constant names.

PR: 27750 (part one)
Submitted by: Andres Salomon <dilinger voxel.net>, Joe Orton

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@153384 13f79535-47bb-0310-9956-ffa450edef68
26 files changed:
configure.in
include/ap_mmn.h
include/ap_regex.h [new file with mode: 0644]
include/http_core.h
include/httpd.h
include/pcreposix.h [deleted file]
modules/experimental/mod_filter.c
modules/filters/mod_include.c
modules/mappers/mod_alias.c
modules/mappers/mod_rewrite.c
modules/metadata/mod_headers.c
modules/metadata/mod_setenvif.c
modules/metadata/mod_usertrack.c
modules/metadata/mod_version.c
modules/proxy/mod_proxy.c
modules/proxy/mod_proxy.h
modules/proxy/mod_proxy_ftp.c
modules/ssl/ssl_expr_eval.c
modules/ssl/ssl_expr_parse.c
modules/ssl/ssl_expr_parse.y
server/Makefile.in
server/core.c
server/request.c
server/util.c
server/util_pcre.c [new file with mode: 0644]
srclib/pcre/Makefile.in