Author: julianfoad
Date: Mon Mar 24 16:45:26 2014
New Revision: 1580914
URL: http://svn.apache.org/r1580914
Log:
* subversion/svn/notify.c
(svn_io_sleep_for_timestamps): Simplify, eliminating a return path that looked
like a potential source of bugs but was probably in fact safe.
Modified:
subversion/trunk/subversion/libsvn_subr/io.c
Modified: subversion/trunk/subversion/libsvn_subr/io.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/io.c?rev=1580914&r1=1580913&r2=1580914&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/io.c (original)
+++ subversion/trunk/subversion/libsvn_subr/io.c Mon Mar 24 16:45:26 2014
@@ -1280,11 +1280,6 @@ svn_io_sleep_for_timestamps(const char *
if (sleep_env_var && apr_strnatcasecmp(sleep_env_var, "yes") == 0)
return; /* Allow skipping for testing */
- now = apr_time_now();
-
- /* Calculate 0.02 seconds after the next second wallclock tick. */
- then = apr_time_make(apr_time_sec(now) + 1, APR_USEC_PER_SEC / 50);
-
/* Worst case is waiting one second, so we can use that time to determine
if we can sleep shorter than that */
if (path)
@@ -1319,12 +1314,12 @@ svn_io_sleep_for_timestamps(const char *
return;
}
+ }
- now = apr_time_now(); /* Extract the time used for the path stat */
+ now = apr_time_now();
- if (now >= then)
- return; /* Passing negative values may suspend indefinitely (Windows)
*/
- }
+ /* Calculate 0.02 seconds after the next second wallclock tick. */
+ then = apr_time_make(apr_time_sec(now) + 1, APR_USEC_PER_SEC / 50);
apr_sleep(then - now);
}
