cvs commit: apache-apr/apr/locks/unix locks.c

[rbb]

rbb         99/05/23 19:38:40

  Modified:    apr/locks/unix locks.c
  Log:
  Fix the final bit of lock logic.
  
  Revision  Changes    Path
  1.6       +6 -6      apache-apr/apr/locks/unix/locks.c
  
  Index: locks.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/locks/unix/locks.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- locks.c   1999/05/24 02:04:04     1.5
  +++ locks.c   1999/05/24 02:38:40     1.6
  @@ -83,12 +83,12 @@
   ap_status_t ap_lock(struct lock_t *lock)
   {
       if (lock->type != APR_CROSS_PROCESS) {
  -        if (lock_intra(lock->cntxt, lock) == APR_FAILURE) {
  +        if (lock_intra(lock) == APR_FAILURE) {
               return APR_FAILURE;
           }
       }
       if (lock->type != APR_INTRAPROCESS) {
  -        if (lock_inter(lock->cntxt, lock) == APR_FAILURE) {
  +        if (lock_inter(lock) == APR_FAILURE) {
               return APR_FAILURE;
           }
       }
  @@ -98,12 +98,12 @@
   ap_status_t ap_unlock(struct lock_t *lock)
   {
       if (lock->type != APR_CROSS_PROCESS) {
  -        if (unlock_intra(lock->cntxt, lock) == APR_FAILURE) {
  +        if (unlock_intra(lock) == APR_FAILURE) {
               return APR_FAILURE;
           }
       }
       if (lock->type != APR_INTRAPROCESS) {
  -        if (unlock_inter(lock->cntxt, lock) == APR_FAILURE) {
  +        if (unlock_inter(lock) == APR_FAILURE) {
               return APR_FAILURE;
           }
       }
  @@ -113,12 +113,12 @@
   ap_status_t ap_destroy_lock(struct lock_t *lock)
   {
       if (lock->type != APR_CROSS_PROCESS) {
  -        if (destroy_intra_lock(lock->cntxt, lock) == APR_FAILURE) {
  +        if (destroy_intra_lock(lock) == APR_FAILURE) {
               return APR_FAILURE;
           }
       }
       if (lock->type != APR_INTRAPROCESS) {
  -        if (destroy_inter_lock(lock->cntxt, lock) == APR_FAILURE) {
  +        if (destroy_inter_lock(lock) == APR_FAILURE) {
               return APR_FAILURE;
           }
       }