rbb         99/05/20 12:05:08

  Modified:    apr/file_io/unix dir.c open.c pipe.c
               apr/threadproc/unix proc.c
  Log:
  Removing the remaining evil free() left over from the original malloc
  implementation.
  
  Revision  Changes    Path
  1.7       +1 -1      apache-apr/apr/file_io/unix/dir.c
  
  Index: dir.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/file_io/unix/dir.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- dir.c     1999/05/13 18:38:02     1.6
  +++ dir.c     1999/05/20 19:05:02     1.7
  @@ -81,7 +81,7 @@
       thedir->entry = NULL;
   
       if (thedir->dirstruct == NULL) {
  -        free(thedir);
  +        thedir->dirstruct = NULL;
           return NULL;
       }    
       else {
  
  
  
  1.20      +1 -2      apache-apr/apr/file_io/unix/open.c
  
  Index: open.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/file_io/unix/open.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- open.c    1999/05/12 19:15:30     1.19
  +++ open.c    1999/05/20 19:05:03     1.20
  @@ -110,8 +110,7 @@
       }
       if ((flag & APR_EXCL) && !(flag & APR_CREATE)) {
           errno = EACCES;
  -        free(dafile->fname);
  -     free(dafile);
  +        dafile->filedes = -1;
           return NULL;
       }   
   
  
  
  
  1.6       +0 -1      apache-apr/apr/file_io/unix/pipe.c
  
  Index: pipe.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/file_io/unix/pipe.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- pipe.c    1999/05/12 19:15:30     1.5
  +++ pipe.c    1999/05/20 19:05:03     1.6
  @@ -86,7 +86,6 @@
   
       tmp = tempnam(dirpath, NULL);
       if (mkfifo(tmp, mode) == -1) {
  -        free(tmp);
           return NULL;
       }
       return tmp;
  
  
  
  1.10      +0 -1      apache-apr/apr/threadproc/unix/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/threadproc/unix/proc.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- proc.c    1999/05/12 20:04:23     1.9
  +++ proc.c    1999/05/20 19:05:06     1.10
  @@ -175,7 +175,6 @@
   
           if (attr->currdir != NULL) {
               if (chdir(attr->currdir) == -1) {
  -                free(new);
                   exit(-1);   /* We have big problems, the child should exit. 
*/
               }
           }
  
  
  

Reply via email to