gstein      00/12/06 00:01:10

  Modified:    include  apr_dbm.h
               src/dbm  apr_dbm.c
  Log:
  complete the apu_ -> apr_ renaming. mostly: apu_datum_t -> apr_datum_t
  
  Revision  Changes    Path
  1.3       +12 -12    apr-util/include/apr_dbm.h
  
  Index: apr_dbm.h
  ===================================================================
  RCS file: /home/cvs/apr-util/include/apr_dbm.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -u -r1.2 -r1.3
  --- apr_dbm.h	2000/12/06 02:19:48	1.2
  +++ apr_dbm.h	2000/12/06 08:01:09	1.3
  @@ -52,8 +52,8 @@
    * <http://www.apache.org/>.
    */
   
  -#ifndef APU_DBM_H
  -#define APU_DBM_H
  +#ifndef APR_DBM_H
  +#define APR_DBM_H
   
   #include "apr.h"
   #include "apr_errno.h"
  @@ -69,7 +69,7 @@
   {
       char *dptr;
       apr_size_t dsize;
  -} apu_datum_t;
  +} apr_datum_t;
   
   /* modes to open the DB */
   #define APR_DBM_READONLY        1       /* open for read-only access */
  @@ -80,14 +80,14 @@
   apr_status_t apr_dbm_open(const char *pathname, apr_pool_t *pool, int mode,
                             apr_dbm_t **pdb);
   void apr_dbm_close(apr_dbm_t *db);
  -apr_status_t apr_dbm_fetch(apr_dbm_t *db, apu_datum_t key,
  -                           apu_datum_t *pvalue);
  -apr_status_t apr_dbm_store(apr_dbm_t *db, apu_datum_t key, apu_datum_t value);
  -apr_status_t apr_dbm_delete(apr_dbm_t *db, apu_datum_t key);
  -int apr_dbm_exists(apr_dbm_t *db, apu_datum_t key);
  -apr_status_t apr_dbm_firstkey(apr_dbm_t *db, apu_datum_t *pkey);
  -apr_status_t apr_dbm_nextkey(apr_dbm_t *db, apu_datum_t *pkey);
  -void apr_dbm_freedatum(apr_dbm_t *db, apu_datum_t data);
  +apr_status_t apr_dbm_fetch(apr_dbm_t *db, apr_datum_t key,
  +                           apr_datum_t *pvalue);
  +apr_status_t apr_dbm_store(apr_dbm_t *db, apr_datum_t key, apr_datum_t value);
  +apr_status_t apr_dbm_delete(apr_dbm_t *db, apr_datum_t key);
  +int apr_dbm_exists(apr_dbm_t *db, apr_datum_t key);
  +apr_status_t apr_dbm_firstkey(apr_dbm_t *db, apr_datum_t *pkey);
  +apr_status_t apr_dbm_nextkey(apr_dbm_t *db, apr_datum_t *pkey);
  +void apr_dbm_freedatum(apr_dbm_t *db, apr_datum_t data);
   
   void apr_dbm_geterror(apr_dbm_t *db, int *errcode, const char **errmsg);
   
  @@ -95,6 +95,6 @@
   }
   #endif
   
  -#endif	/* !APU_DBM_H */
  +#endif	/* !APR_DBM_H */
   
   
  
  
  
  1.6       +9 -9      apr-util/src/dbm/apr_dbm.c
  
  Index: apr_dbm.c
  ===================================================================
  RCS file: /home/cvs/apr-util/src/dbm/apr_dbm.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -u -r1.5 -r1.6
  --- apr_dbm.c	2000/12/06 02:19:50	1.5
  +++ apr_dbm.c	2000/12/06 08:01:10	1.6
  @@ -121,9 +121,9 @@
       const char *errmsg;
   };
   
  -/* apu_datum <=> real_datum casting/conversions */
  +/* apr_datum <=> real_datum casting/conversions */
   #define A2R_DATUM(d)    (*(real_datum_t *)&(d))
  -#define R2A_DATUM(d)    (*(apu_datum_t *)&(d))
  +#define R2A_DATUM(d)    (*(apr_datum_t *)&(d))
   
   
   static apr_status_t set_error(apr_dbm_t *db)
  @@ -213,7 +213,7 @@
       APR_DBM_CLOSE(db->file);
   }
   
  -apr_status_t apr_dbm_fetch(apr_dbm_t *db, apu_datum_t key, apu_datum_t *pvalue)
  +apr_status_t apr_dbm_fetch(apr_dbm_t *db, apr_datum_t key, apr_datum_t *pvalue)
   {
       *(real_datum_t *) pvalue = APR_DBM_FETCH(db->file, A2R_DATUM(key));
   
  @@ -222,7 +222,7 @@
       return set_error(db);
   }
   
  -apr_status_t apr_dbm_store(apr_dbm_t *db, apu_datum_t key, apu_datum_t value)
  +apr_status_t apr_dbm_store(apr_dbm_t *db, apr_datum_t key, apr_datum_t value)
   {
       apr_status_t rv;
   
  @@ -237,7 +237,7 @@
       return rv;
   }
   
  -apr_status_t apr_dbm_delete(apr_dbm_t *db, apu_datum_t key)
  +apr_status_t apr_dbm_delete(apr_dbm_t *db, apr_datum_t key)
   {
       apr_status_t rv;
   
  @@ -252,7 +252,7 @@
       return rv;
   }
   
  -int apr_dbm_exists(apr_dbm_t *db, apu_datum_t key)
  +int apr_dbm_exists(apr_dbm_t *db, apr_datum_t key)
   {
       int exists;
   
  @@ -268,7 +268,7 @@
       return exists;
   }
   
  -apr_status_t apr_dbm_firstkey(apr_dbm_t *db, apu_datum_t *pkey)
  +apr_status_t apr_dbm_firstkey(apr_dbm_t *db, apr_datum_t *pkey)
   {
       *(real_datum_t *) pkey = APR_DBM_FIRSTKEY(db->file);
   
  @@ -277,7 +277,7 @@
       return set_error(db);
   }
   
  -apr_status_t apr_dbm_nextkey(apr_dbm_t *db, apu_datum_t *pkey)
  +apr_status_t apr_dbm_nextkey(apr_dbm_t *db, apr_datum_t *pkey)
   {
       *(real_datum_t *) pkey = APR_DBM_NEXTKEY(db->file, A2R_DATUM(*pkey));
   
  @@ -286,7 +286,7 @@
       return set_error(db);
   }
   
  -void apr_dbm_freedatum(apr_dbm_t *db, apu_datum_t data)
  +void apr_dbm_freedatum(apr_dbm_t *db, apr_datum_t data)
   {
       APR_DBM_FREEDATUM(db, data);
   }