apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: apr-util/dbm/sdbm sdbm.c
Date Wed, 02 May 2001 13:37:53 GMT
wrowe       01/05/02 06:37:53

  Modified:    include  apr_sdbm.h
               dbm      apr_dbm.c
               dbm/sdbm sdbm.c
  Log:
    Namespace protect a violator
  
  Revision  Changes    Path
  1.6       +2 -2      apr-util/include/apr_sdbm.h
  
  Index: apr_sdbm.h
  ===================================================================
  RCS file: /home/cvs/apr-util/include/apr_sdbm.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- apr_sdbm.h	2001/05/01 05:37:43	1.5
  +++ apr_sdbm.h	2001/05/02 13:37:52	1.6
  @@ -78,8 +78,8 @@
   } apr_sdbm_datum_t;
   
   /* The extensions used for the database files */
  -#define SDBM_DIRFEXT	".dir"
  -#define SDBM_PAGFEXT	".pag"
  +#define APR_SDBM_DIRFEXT	".dir"
  +#define APR_SDBM_PAGFEXT	".pag"
   
   /* Standard dbm interface */
   
  
  
  
  1.23      +2 -2      apr-util/dbm/apr_dbm.c
  
  Index: apr_dbm.c
  ===================================================================
  RCS file: /home/cvs/apr-util/dbm/apr_dbm.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- apr_dbm.c	2001/05/01 05:31:22	1.22
  +++ apr_dbm.c	2001/05/02 13:37:52	1.23
  @@ -588,11 +588,11 @@
   #if APU_USE_SDBM
       char *work;
   
  -    *used1 = apr_pstrcat(p, pathname, SDBM_DIRFEXT, NULL);
  +    *used1 = apr_pstrcat(p, pathname, APR_SDBM_DIRFEXT, NULL);
       *used2 = work = apr_pstrdup(p, *used1);
   
       /* we know the extension is 4 characters */
  -    memcpy(&work[strlen(work) - 4], SDBM_PAGFEXT, 4);
  +    memcpy(&work[strlen(work) - 4], APR_SDBM_PAGFEXT, 4);
   #elif APU_USE_GDBM || APU_USE_DB
       *used1 = apr_pstrdup(p, pathname);
       *used2 = NULL;
  
  
  
  1.18      +2 -2      apr-util/dbm/sdbm/sdbm.c
  
  Index: sdbm.c
  ===================================================================
  RCS file: /home/cvs/apr-util/dbm/sdbm/sdbm.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- sdbm.c	2001/05/02 13:33:35	1.17
  +++ sdbm.c	2001/05/02 13:37:53	1.18
  @@ -204,8 +204,8 @@
                              apr_int32_t flags, apr_fileperms_t perms,
                              apr_pool_t *p)
   {
  -    char *dirname = apr_pstrcat(p, file, SDBM_DIRFEXT, NULL);
  -    char *pagname = apr_pstrcat(p, file, SDBM_PAGFEXT, NULL);
  +    char *dirname = apr_pstrcat(p, file, APR_SDBM_DIRFEXT, NULL);
  +    char *pagname = apr_pstrcat(p, file, APR_SDBM_PAGFEXT, NULL);
       
       return prep(db, dirname, pagname, flags, perms, p);
   }
  
  
  

Mime
View raw message