apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject cvs commit: apr/threadproc/win32 thread.c
Date Thu, 23 Sep 2004 10:55:12 GMT
mturk       2004/09/23 03:55:12

  Modified:    threadproc/win32 Tag: APR_0_9_BRANCH thread.c
  Log:
  Remove DOS line endings. Can not believe I've committed that.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.54.2.3  +22 -22    apr/threadproc/win32/thread.c
  
  Index: thread.c
  ===================================================================
  RCS file: /home/cvs/apr/threadproc/win32/thread.c,v
  retrieving revision 1.54.2.2
  retrieving revision 1.54.2.3
  diff -u -r1.54.2.2 -r1.54.2.3
  --- thread.c	23 Sep 2004 06:17:59 -0000	1.54.2.2
  +++ thread.c	23 Sep 2004 10:55:12 -0000	1.54.2.3
  @@ -38,7 +38,7 @@
       }
   
       (*new)->pool = pool;
  -    (*new)->detach = 0;
  +    (*new)->detach = 0;
   
       return APR_SUCCESS;
   }
  @@ -106,7 +106,7 @@
       }
   #endif
       if (attr && attr->detach) {
  -        CloseHandle(handle);
  +        CloseHandle(handle);
       }
       else
           (*new)->td = handle;
  @@ -131,26 +131,26 @@
   APR_DECLARE(apr_status_t) apr_thread_join(apr_status_t *retval,
                                             apr_thread_t *thd)
   {
  -    apr_status_t rv = APR_SUCCESS;
  -    
  -    if (!thd->td) {
  -        /* Can not join on detached threads */
  -        return APR_DETACH;
  -    }
  -    rv = WaitForSingleObject(thd->td, INFINITE);
  -    if ( rv == WAIT_OBJECT_0 || rv == WAIT_ABANDONED) {
  -        /* If the thread_exit has been called */
  -        if (!thd->pool)
  -            *retval = thd->exitval;
  -        else
  -            rv = APR_INCOMPLETE;
  -    }
  -    else
  -        rv = apr_get_os_error();
  -    CloseHandle(thd->td);
  -    thd->td = NULL;
  -
  -    return rv;
  +    apr_status_t rv = APR_SUCCESS;
  +    
  +    if (!thd->td) {
  +        /* Can not join on detached threads */
  +        return APR_DETACH;
  +    }
  +    rv = WaitForSingleObject(thd->td, INFINITE);
  +    if ( rv == WAIT_OBJECT_0 || rv == WAIT_ABANDONED) {
  +        /* If the thread_exit has been called */
  +        if (!thd->pool)
  +            *retval = thd->exitval;
  +        else
  +            rv = APR_INCOMPLETE;
  +    }
  +    else
  +        rv = apr_get_os_error();
  +    CloseHandle(thd->td);
  +    thd->td = NULL;
  +
  +    return rv;
   }
   
   APR_DECLARE(apr_status_t) apr_thread_detach(apr_thread_t *thd)
  
  
  

Mime
View raw message