You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Paul Querna <ch...@force-elite.com> on 2005/05/04 20:55:16 UTC

[PATCH] Cleanup util_pcre.c

server/util_pcre.c was copied here from srclib/pcre/pcreposix.c, and has
since been de-libpcre'ized.

It currently doesn't look anything like the standard httpd style, and it
does not contain an ASL 2.0 License Header.

Attached is a patch that cleans the style up, and also adds an ASL
license block.

If no one cares, I will apply it later tonight.

-Paul

Re: [PATCH] Cleanup util_pcre.c

Posted by Joe Orton <jo...@redhat.com>.
On Wed, May 04, 2005 at 11:55:16AM -0700, Paul Querna wrote:
> server/util_pcre.c was copied here from srclib/pcre/pcreposix.c, and has
> since been de-libpcre'ized.
> 
> It currently doesn't look anything like the standard httpd style, and it
> does not contain an ASL 2.0 License Header.
> 
> Attached is a patch that cleans the style up, and also adds an ASL
> license block.

I didn't make any style changes originally to avoid making it difficult
to merge in changes from upstream PCRE release; but I guess these would
require manual merging anyway, so I guess this makes sense.  The
copyright year should be just 2005 not 2001-2005 I think; plus:

...
> -AP_DECLARE(apr_size_t) ap_regerror(int errcode, const ap_regex_t *preg, 
> -                                   char *errbuf, apr_size_t errbuf_size)
> +AP_DECLARE(apr_size_t) ap_regerror(int errcode, const ap_regex_t * preg,
> +				   char *errbuf, apr_size_t errbuf_size)

in all the prototypes you have somehow introduced tabbed intending and
put spaces after the '*' which shouldn't be there.

...
> -AP_DECLARE(void) ap_regfree(ap_regex_t *preg)
> +AP_DECLARE(void) ap_regfree(ap_regex_t * preg)

etc.  Thanks Paul...

joe