From owner-svn-src-head@FreeBSD.ORG Tue Nov 11 13:34:05 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 13510BBD for ; Tue, 11 Nov 2014 13:34:05 +0000 (UTC) Received: from mail-la0-f48.google.com (mail-la0-f48.google.com [209.85.215.48]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B2959C93 for ; Tue, 11 Nov 2014 13:34:04 +0000 (UTC) Received: by mail-la0-f48.google.com with SMTP id gq15so9688815lab.35 for ; Tue, 11 Nov 2014 05:33:57 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :subject:references:in-reply-to:content-type :content-transfer-encoding; bh=kAxXQykdP7WZinkcg2F6p1PwR6OxBslJV3SR5nrWyLA=; b=Dli7zGtrtgZY6JDLwWXV/tyjSaH/cMjdcTGZwnlaQt7rAm4I95tFZBuifNzOpzw0dT dvkLH3rrw/QOkJeytvKzDgtk1HbfUkGMlc7IqaB8CPg/HUoEwKcr7aCw7b74LNDjHPYM +4F1fVlSX1fQyoxevRkY/2QqQinz60RckQU+csFFNiro8fFjfkc04UcQSt7YkIvCgzBl qzQwKzajj8F0NDTqrZtfag9U40nRl8J5WaEOlwnUfBm9VCN8YagikR2ZD4rGAh++f7Gw fYjIMaPcMH79P4/VlHe8HlLq1jhjC4uN08R2O/S1xhuT7DaXfTgjgQYSxgFH7tBUg735 HfFg== X-Gm-Message-State: ALoCoQljXoTziRtsQ8VAjFhCH7Io59KKxSOMFrBVFVrvlTPHTXdRivD1BFIgsPNEEG8iHjQ6nKpX X-Received: by 10.152.234.227 with SMTP id uh3mr36570988lac.69.1415712837316; Tue, 11 Nov 2014 05:33:57 -0800 (PST) Received: from [192.168.1.2] ([89.169.173.68]) by mx.google.com with ESMTPSA id t6sm5987501lbb.23.2014.11.11.05.33.55 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Nov 2014 05:33:56 -0800 (PST) Message-ID: <54621043.9000502@freebsd.org> Date: Tue, 11 Nov 2014 16:33:55 +0300 From: Andrey Chernov User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: Garrett Cooper , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r274365 - head/contrib/tzcode/stdtime References: <201411110407.sAB47gBT003976@svn.freebsd.org> In-Reply-To: <201411110407.sAB47gBT003976@svn.freebsd.org> Content-Type: text/plain; charset=koi8-r Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Nov 2014 13:34:05 -0000 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/