apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject cvs commit: apr/shmem/unix shmem.c
Date Tue, 14 Aug 2001 05:17:58 GMT
rbb         01/08/13 22:17:58

  Modified:    .        CHANGES
               shmem/unix shmem.c
  Log:
  Fix the new shared memory code.  We need to pass a pointer to
  an apr_file_t to apr_file_open.  Also, apr_os_file_get returns
  a status value, not the OS file descriptor.
  
  This gets Apache running again on Linux.
  
  Revision  Changes    Path
  1.139     +4 -0      apr/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr/CHANGES,v
  retrieving revision 1.138
  retrieving revision 1.139
  diff -u -r1.138 -r1.139
  --- CHANGES	2001/08/14 05:14:59	1.138
  +++ CHANGES	2001/08/14 05:17:58	1.139
  @@ -1,5 +1,9 @@
   Changes with APR b1  
   
  +  *) Fix the new shared memory code.  We need to pass a pointer to
  +     an apr_file_t to apr_file_open.  Also, apr_os_file_get returns
  +     a status value, not the OS file descriptor.  [Ryan Bloom]
  +
     *) Fix the new shared memory configure script.  The APR_DECIDE
        macros go in order, so the last set of dependancies that are
        met are the ones used.  That means that when using those macros,
  
  
  
  1.27      +3 -3      apr/shmem/unix/shmem.c
  
  Index: shmem.c
  ===================================================================
  RCS file: /home/cvs/apr/shmem/unix/shmem.c,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- shmem.c	2001/08/13 23:45:48	1.26
  +++ shmem.c	2001/08/14 05:17:58	1.27
  @@ -128,13 +128,13 @@
       
   #if APR_USE_SHMEM_MMAP_TMP
       /* FIXME: Is APR_OS_DEFAULT sufficient? */
  -    status = apr_file_open(new_m->file, filename, 
  +    status = apr_file_open(&new_m->file, filename, 
                            APR_READ | APR_WRITE | APR_CREATE, APR_OS_DEFAULT,
                            pool);
       if (status != APR_SUCCESS)
           return APR_EGENERAL;
   
  -    tmpfd = apr_os_file_get(&tmpfd, new_m->file);
  +    status = apr_os_file_get(&tmpfd, new_m->file);
       status = apr_file_trunc(new_m->file, reqsize);
       if (status != APR_SUCCESS)
           return APR_EGENERAL;
  @@ -157,7 +157,7 @@
                            APR_OS_DEFAULT);
       if (status != APR_SUCCESS)
           return APR_EGENERAL;
  -    tmpfd = apr_os_file_get(&tmpfd, new_m->file);
  +    status = apr_os_file_get(&tmpfd, new_m->file);
   #endif
   
       mem = mmap(NULL, reqsize, PROT_READ|PROT_WRITE, MAP_SHARED, tmpfd, 0);
  
  
  

Mime
View raw message