Return-Path: Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 8529 invoked by uid 500); 5 May 2002 22:28:05 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 8481 invoked by uid 500); 5 May 2002 22:28:05 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Date: 5 May 2002 22:28:03 -0000 Message-ID: <20020505222803.93846.qmail@icarus.apache.org> From: jwoolley@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/modules/experimental cache_hash.h mod_mem_cache.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N jwoolley 02/05/05 15:28:03 Modified: modules/experimental cache_hash.h mod_mem_cache.c Log: Fix compile break: mod_mem_cache.c: In function `cleanup_cache_mem': mod_mem_cache.c:251: too many arguments to function `cache_hash_first' make[4]: *** [mod_mem_cache.slo] Error 1 Revision Changes Path 1.2 +2 -4 httpd-2.0/modules/experimental/cache_hash.h Index: cache_hash.h =================================================================== RCS file: /home/cvs/httpd-2.0/modules/experimental/cache_hash.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -u -r1.1 -r1.2 --- cache_hash.h 4 May 2002 19:54:39 -0000 1.1 +++ cache_hash.h 5 May 2002 22:28:03 -0000 1.2 @@ -130,20 +130,18 @@ /** * Start iterating over the entries in a hash table. - * @param p The pool to allocate the cache_hash_index_t iterator. If this - * pool is NULL, then an internal, non-thread-safe iterator is used. * @param ht The hash table * @example */ /** * 
    * 
  - *     int sum_values(apr_pool_t *p, cache_hash_t *ht)
  + *     int sum_values(cache_hash_t *ht)
    *     {
    *         cache_hash_index_t *hi;
    * 	   void *val;
    * 	   int sum = 0;
  - * 	   for (hi = cache_hash_first(p, ht); hi; hi = cache_hash_next(hi)) {
  + * 	   for (hi = cache_hash_first(ht); hi; hi = cache_hash_next(hi)) {
    * 	       cache_hash_this(hi, NULL, NULL, &val);
    * 	       sum += *(int *)val;
    * 	   }
  
  
  
  1.54      +1 -1      httpd-2.0/modules/experimental/mod_mem_cache.c
  
  Index: mod_mem_cache.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_mem_cache.c,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -d -u -r1.53 -r1.54
  --- mod_mem_cache.c	4 May 2002 19:54:39 -0000	1.53
  +++ mod_mem_cache.c	5 May 2002 22:28:03 -0000	1.54
  @@ -248,7 +248,7 @@
           apr_thread_mutex_lock(sconf->lock);
       }
       /* Iterate over the cache and clean up each entry */
  -    while ((hi = cache_hash_first(NULL, co->cacheht)) != NULL) {
  +    while ((hi = cache_hash_first(co->cacheht)) != NULL) {
           /* Fetch the object from the cache */
           cache_hash_this(hi, NULL, NULL, (void **)&obj);
           if (obj) {