httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Martin Kraemer <Martin.Krae...@mch.sni.de>
Subject Re: [PATCH] Take 2: Make check_cmd_context() globally available
Date Thu, 19 Feb 1998 21:26:59 GMT
On Thu, Feb 19, 1998 at 10:06:58PM +0100, Martin Kraemer wrote:
> Note that I renamed NOT_IN_LOC to NOT_IN_LOCATION, therefore THIS PATCH
> CONFLICTS WITH the core.sectionnesting.patch I sent earlier today.
> The conflict is only one line (the line with the NOT_IN_LOC use).

Stupid me. The reason for the conflict of course wasn't the rename, but
the addition of struct command_rec *thiscmd _close_to_ the renamed
define. The context diff therefore may show a mismatch when patched:

> @@ -1079,10 +1080,10 @@
>      core_dir_config *conf;
>      regex_t *r = NULL;
>      const char *old_end_token;
> <--- here's where thiscmd was added.
>
>      void *new_file_conf = create_per_dir_config (cmd->pool);
>  
> -    const char *err = check_cmd_context(cmd, NOT_IN_LIMIT | NOT_IN_LOC);
> +    const char *err = check_cmd_context(cmd, NOT_IN_LIMIT | NOT_IN_LOCATION);

And later,
> -    if (not) arg++;
> +    if (not) arg++; /* cfg_getline() reduced multiple blanks to one */
this comment is bogus. There's no space near the '!' character which is
skipped here. (For other parts of the code, it IS essential that
cfg_getline() strips leading whitespace, but here, I was totally wrong...)

Patch Take 2 attached.
    Martin
-- 
| S I E M E N S |  <Martin.Kraemer@mch.sni.de>  |      Siemens Nixdorf
| ------------- |   Voice: +49-89-636-46021     |  Informationssysteme AG
| N I X D O R F |   FAX:   +49-89-636-44994     |   81730 Munich, Germany
~~~~~~~~~~~~~~~~My opinions only, of course; pgp key available on request

Mime
View raw message