| apr_tables.c (251886) | apr_tables.c (253734) |
|---|---|
| 1/* Licensed to the Apache Software Foundation (ASF) under one or more 2 * contributor license agreements. See the NOTICE file distributed with 3 * this work for additional information regarding copyright ownership. 4 * The ASF licenses this file to You under the Apache License, Version 2.0 5 * (the "License"); you may not use this file except in compliance with 6 * the License. You may obtain a copy of the License at 7 * 8 * http://www.apache.org/licenses/LICENSE-2.0 --- 720 unchanged lines hidden (view full) --- 729{ 730 apr_table_entry_t *next_elt; 731 apr_table_entry_t *end_elt; 732 apr_uint32_t checksum; 733 int hash; 734 735#if APR_POOL_DEBUG 736 { | 1/* Licensed to the Apache Software Foundation (ASF) under one or more 2 * contributor license agreements. See the NOTICE file distributed with 3 * this work for additional information regarding copyright ownership. 4 * The ASF licenses this file to You under the Apache License, Version 2.0 5 * (the "License"); you may not use this file except in compliance with 6 * the License. You may obtain a copy of the License at 7 * 8 * http://www.apache.org/licenses/LICENSE-2.0 --- 720 unchanged lines hidden (view full) --- 729{ 730 apr_table_entry_t *next_elt; 731 apr_table_entry_t *end_elt; 732 apr_uint32_t checksum; 733 int hash; 734 735#if APR_POOL_DEBUG 736 { |
| 737 if (!apr_pool_is_ancestor(apr_pool_find(key), t->a.pool)) { | 737 apr_pool_t *pool; 738 pool = apr_pool_find(key); 739 if ((pool != key) && (!apr_pool_is_ancestor(pool, t->a.pool))) { |
| 738 fprintf(stderr, "apr_table_mergen: key not in ancestor pool of t\n"); 739 abort(); 740 } | 740 fprintf(stderr, "apr_table_mergen: key not in ancestor pool of t\n"); 741 abort(); 742 } |
| 741 if (!apr_pool_is_ancestor(apr_pool_find(val), t->a.pool)) { | 743 pool = apr_pool_find(val); 744 if ((pool != val) && (!apr_pool_is_ancestor(pool, t->a.pool))) { |
| 742 fprintf(stderr, "apr_table_mergen: val not in ancestor pool of t\n"); 743 abort(); 744 } 745 } 746#endif 747 748 COMPUTE_KEY_CHECKSUM(key, checksum); 749 hash = TABLE_HASH(key); --- 486 unchanged lines hidden --- | 745 fprintf(stderr, "apr_table_mergen: val not in ancestor pool of t\n"); 746 abort(); 747 } 748 } 749#endif 750 751 COMPUTE_KEY_CHECKSUM(key, checksum); 752 hash = TABLE_HASH(key); --- 486 unchanged lines hidden --- |