svn commit: r274365 - head/contrib/tzcode/stdtime

Andrey Chernov ache at freebsd.org
Tue Nov 11 13:34:05 UTC 2014


On 11.11.2014 7:07, Garrett Cooper wrote:
> Author: ngie
> Date: Tue Nov 11 04:07:41 2014
> New Revision: 274365
> URL: https://svnweb.freebsd.org/changeset/base/274365
> 
> Log:
>   Revert WiP to contrib/tzcode accidentally committed with r274364

This code is wrong in any case, setting EOVERFLOW even in unneeded
no-error cases like breaking from the loop. See how NetBSD does it
correctly instead.

> 
> Modified:
>   head/contrib/tzcode/stdtime/localtime.c
> 
> Modified: head/contrib/tzcode/stdtime/localtime.c
> ==============================================================================
> --- head/contrib/tzcode/stdtime/localtime.c	Tue Nov 11 04:06:05 2014	(r274364)
> +++ head/contrib/tzcode/stdtime/localtime.c	Tue Nov 11 04:07:41 2014	(r274365)
> @@ -1792,11 +1792,7 @@ int	delta;
>  
>  	number0 = *number;
>  	*number += delta;
> -	if ((*number < number0) != (delta < 0)) {
> -		errno = EOVERFLOW;
> -		return (1);
> -	}
> -	return (0);
> +	return (*number < number0) != (delta < 0);
>  }
>  
>  static int
> @@ -1808,11 +1804,7 @@ int	delta;
>  
>  	number0 = *number;
>  	*number += delta;
> -	if ((*number < number0) != (delta < 0)) {
> -		errno = EOVERFLOW;
> -		return (1);
> -	}
> -	return (0);
> +	return (*number < number0) != (delta < 0);
>  }
>  
>  static int
> 


-- 
http://ache.vniz.net/


More information about the svn-src-head mailing list