httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/modules/experimental util_ldap_cache.h util_ldap_cache_mgr.c
Date Sun, 01 Dec 2002 22:26:46 GMT
wrowe       2002/12/01 14:26:46

  Modified:    modules/experimental Tag: APACHE_2_0_BRANCH
                        util_ldap_cache.h util_ldap_cache_mgr.c
  Log:
    Outch... many mismatches on data types.  Seems we are consistent in
    util_ldap_cache_mgr using apr_time() APIs, but the declarations surely
    didn't match up.  Nor did the index types.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.4.2.1   +5 -5      httpd-2.0/modules/experimental/util_ldap_cache.h
  
  Index: util_ldap_cache.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/experimental/util_ldap_cache.h,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- util_ldap_cache.h	30 Jul 2002 19:38:11 -0000	1.4
  +++ util_ldap_cache.h	1 Dec 2002 22:26:46 -0000	1.4.2.1
  @@ -73,7 +73,7 @@
   
   typedef struct util_cache_node_t {
       void *payload;		/* Pointer to the payload */
  -    time_t add_time;		/* Time node was added to cache */
  +    apr_time_t add_time;	/* Time node was added to cache */
       struct util_cache_node_t *next;
   } util_cache_node_t;
   
  @@ -82,16 +82,16 @@
       unsigned long maxentries;	/* Maximum number of cache entries */
       unsigned long numentries;	/* Current number of cache entries */
       unsigned long fullmark;	/* Used to keep track of when cache becomes 3/4 full */
  -    time_t marktime;		/* Time that the cache became 3/4 full */
  +    apr_time_t marktime;	/* Time that the cache became 3/4 full */
       unsigned long (*hash)(void *);  /* Func to hash the payload */
       int (*compare)(void *, void *); /* Func to compare two payloads */
       void * (*copy)(void *);	/* Func to alloc mem and copy payload to new mem */
  -    void (*free)(void *);		/* Func to free mem used by the payload */
  +    void (*free)(void *);	/* Func to free mem used by the payload */
       util_cache_node_t **nodes;
   
       unsigned long numpurges;	/* No. of times the cache has been purged */
  -    double avg_purgetime;		/* Average time to purge the cache */
  -    time_t last_purge;		/* Time of the last purge */
  +    double avg_purgetime;	/* Average time to purge the cache */
  +    apr_time_t last_purge;	/* Time of the last purge */
       unsigned long npurged;	/* Number of elements purged in last purge. This is not
   				   obvious: it won't be 3/4 the size of the cache if 
   				   there were a lot of expired entries. */
  
  
  
  1.3.2.1   +6 -6      httpd-2.0/modules/experimental/util_ldap_cache_mgr.c
  
  Index: util_ldap_cache_mgr.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/experimental/util_ldap_cache_mgr.c,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- util_ldap_cache_mgr.c	28 May 2002 19:26:26 -0000	1.3
  +++ util_ldap_cache_mgr.c	1 Dec 2002 22:26:46 -0000	1.3.2.1
  @@ -73,7 +73,7 @@
   /* here till malloc is gone */
   #include <stdlib.h>
   
  -static const int primes[] =
  +static const unsigned long primes[] =
   {
     11,
     19,
  @@ -201,7 +201,7 @@
   */
   void util_ald_cache_purge(util_ald_cache_t *cache)
   {
  -    int i;
  +    unsigned long i;
       util_cache_node_t *p, *q;
       apr_time_t t;
   
  @@ -287,7 +287,7 @@
                                   void (*freefunc)(void *))
   {
       util_ald_cache_t *cache;
  -    int i;
  +    unsigned long i;
   
       if (maxentries <= 0)
           return NULL;
  @@ -334,7 +334,7 @@
   
   void util_ald_destroy_cache(util_ald_cache_t *cache)
   {
  -    int i;
  +    unsigned long i;
       util_cache_node_t *p, *q;
   
       if (cache == NULL)
  @@ -438,7 +438,7 @@
   
   char *util_ald_cache_display_stats(apr_pool_t *p, util_ald_cache_t *cache, char *name)
   {
  -    int i;
  +    unsigned long i;
       int totchainlen = 0;
       int nchains = 0;
       double chainlen;
  @@ -501,7 +501,7 @@
   
   char *util_ald_cache_display(apr_pool_t *pool)
   {
  -    int i;
  +    unsigned long i;
       char *buf, *t1, *t2, *t3;
   
       if (!util_ldap_cache) {
  
  
  

Mime
View raw message