cvs commit: apache-2.0/src/lib/apr/lib apr_tables.c

[bhyde]

bhyde       99/10/17 09:11:44

  Modified:    src/lib/apr/lib apr_tables.c
  Log:
  Resolve pool->context issues with tables when compiled with POOL_DEBUG 
defined.
  
  Revision  Changes    Path
  1.5       +9 -9      apache-2.0/src/lib/apr/lib/apr_tables.c
  
  Index: apr_tables.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_tables.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- apr_tables.c      1999/10/11 22:39:36     1.4
  +++ apr_tables.c      1999/10/17 16:11:43     1.5
  @@ -314,7 +314,7 @@
       /* we don't copy keys and values, so it's necessary that t->a.pool
        * have a life span at least as long as p
        */
  -    if (!ap_pool_is_ancestor(t->a.pool, p)) {
  +    if (!ap_pool_is_ancestor(t->a.cont->pool, p->pool)) {
        fprintf(stderr, "copy_table: t's pool is not an ancestor of p\n");
        abort();
       }
  @@ -391,11 +391,11 @@
   
   #ifdef POOL_DEBUG
       {
  -     if (!ap_pool_is_ancestor(ap_find_pool(key), t->a.pool)) {
  +     if (!ap_pool_is_ancestor(ap_find_pool(key), t->a.cont->pool)) {
            fprintf(stderr, "table_set: key not in ancestor pool of t\n");
            abort();
        }
  -     if (!ap_pool_is_ancestor(ap_find_pool(val), t->a.pool)) {
  +     if (!ap_pool_is_ancestor(ap_find_pool(val), t->a.cont->pool)) {
            fprintf(stderr, "table_set: val not in ancestor pool of t\n");
            abort();
        }
  @@ -480,11 +480,11 @@
   
   #ifdef POOL_DEBUG
       {
  -     if (!ap_pool_is_ancestor(ap_find_pool(key), t->a.pool)) {
  +     if (!ap_pool_is_ancestor(ap_find_pool(key), t->a.cont->pool)) {
            fprintf(stderr, "table_set: key not in ancestor pool of t\n");
            abort();
        }
  -     if (!ap_pool_is_ancestor(ap_find_pool(val), t->a.pool)) {
  +     if (!ap_pool_is_ancestor(ap_find_pool(val), t->a.cont->pool)) {
            fprintf(stderr, "table_set: key not in ancestor pool of t\n");
            abort();
        }
  @@ -520,11 +520,11 @@
   
   #ifdef POOL_DEBUG
       {
  -     if (!ap_pool_is_ancestor(ap_find_pool(key), t->a.pool)) {
  +     if (!ap_pool_is_ancestor(ap_find_pool(key), t->a.cont->pool)) {
            fprintf(stderr, "table_set: key not in ancestor pool of t\n");
            abort();
        }
  -     if (!ap_pool_is_ancestor(ap_find_pool(val), t->a.pool)) {
  +     if (!ap_pool_is_ancestor(ap_find_pool(val), t->a.cont->pool)) {
            fprintf(stderr, "table_set: key not in ancestor pool of t\n");
            abort();
        }
  @@ -547,12 +547,12 @@
        * overlay->a.pool and base->a.pool have a life span at least
        * as long as p
        */
  -    if (!ap_pool_is_ancestor(overlay->a.pool, p->pool)) {
  +    if (!ap_pool_is_ancestor(overlay->a.cont->pool, p->pool)) {
        fprintf(stderr,
                "overlay_tables: overlay's pool is not an ancestor of p\n");
        abort();
       }
  -    if (!ap_pool_is_ancestor(base->a.pool, p->pool)) {
  +    if (!ap_pool_is_ancestor(base->a.cont->pool, p->pool)) {
        fprintf(stderr,
                "overlay_tables: base's pool is not an ancestor of p\n");
        abort();