Return-Path: X-Original-To: apmail-subversion-dev-archive@minotaur.apache.org Delivered-To: apmail-subversion-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B414D179AB for ; Wed, 7 Oct 2015 12:58:20 +0000 (UTC) Received: (qmail 23803 invoked by uid 500); 7 Oct 2015 12:58:11 -0000 Delivered-To: apmail-subversion-dev-archive@subversion.apache.org Received: (qmail 23753 invoked by uid 500); 7 Oct 2015 12:58:11 -0000 Mailing-List: contact dev-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list dev@subversion.apache.org Received: (qmail 23743 invoked by uid 99); 7 Oct 2015 12:58:10 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Oct 2015 12:58:10 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 6F8221A22D9 for ; Wed, 7 Oct 2015 12:58:10 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 2.899 X-Spam-Level: ** X-Spam-Status: No, score=2.899 tagged_above=-999 required=6.31 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HTML_MESSAGE=3, RCVD_IN_MSPIKE_H2=-0.001] autolearn=disabled Authentication-Results: spamd2-us-west.apache.org (amavisd-new); dkim=pass (1024-bit key) header.d=wandisco.com Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id 8hppQok_Q9bs for ; Wed, 7 Oct 2015 12:58:05 +0000 (UTC) Received: from mail-io0-f172.google.com (mail-io0-f172.google.com [209.85.223.172]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with ESMTPS id 7AB3F439D0 for ; Wed, 7 Oct 2015 12:58:05 +0000 (UTC) Received: by ioii196 with SMTP id i196so20759853ioi.3 for ; Wed, 07 Oct 2015 05:57:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wandisco.com; s=gapps; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=g8KL1uxpjYofzoJQWOYf72dz1Y1Lwh24JclwPDpXiW4=; b=DNPuQHCvhe1osfZg3LqgiSEB4grrfAke7fxHBi9o5hHm8WbSs95qdWsJi9xXojNxhN G3op5Vl9bbl9HsNHRWTZ7TQSIw0BVb5s+JFqMJYx1ePyQNqvBub0gulUqIVZLpmvydMH 1tefw/HbKAzeD0+L2W6Oqrx06c1shH4fZAyYE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=g8KL1uxpjYofzoJQWOYf72dz1Y1Lwh24JclwPDpXiW4=; b=B0pUKkxe/mXWLThLP3jWAn9sDC30EiQFHgN/XBbCNMrGVjDfzVizQK4fN6DSOuOE4R UWZ7KT7Abd2Nyfo+Y6+nkuIiItsoxtUw1V6zzk4tHnRqTswv8BiybVfCB6oJuS3G0nz0 PGChayC9e+MK5HZsYzpkTSJsEMlW6hIySE25D08+f+dDaqnLnfaeRSt1LSnuVPmHFYvY Q3twbAwPrydpBCY4fqGbX/AK414Djbo2a5xxjlGPI7cLdp+MgbdGxxiur57hF3vFOEpE eVMC/rH0LNaC6wrjueJHSCXVqT4VaXmdp57vPjQVoLhpv+Cx/6s8rKsDjYZXiyxfjDuu DA+g== X-Gm-Message-State: ALoCoQnFPbJH/yDnoODL0eFf1JU149RHA7h9SoMw8h8JzsI5ZC/qaW51AOVZsqRuJmt7zHX021x0 MIME-Version: 1.0 X-Received: by 10.107.4.82 with SMTP id 79mr1556464ioe.10.1444222679565; Wed, 07 Oct 2015 05:57:59 -0700 (PDT) Received: by 10.50.225.71 with HTTP; Wed, 7 Oct 2015 05:57:59 -0700 (PDT) In-Reply-To: References: <20151007075707.21F4B3A0046@svn01-us-west.apache.org> <4ad801d100f0$8c352820$a49f7860$@qqmail.nl> Date: Wed, 7 Oct 2015 14:57:59 +0200 Message-ID: Subject: Re: svn commit: r1707196 - /subversion/trunk/subversion/libsvn_subr/stream.c From: Stefan Fuhrmann To: Julian Foad Cc: Ivan Zhakov , Bert Huijben , dev Content-Type: multipart/mixed; boundary=001a113efc82cbc9070521834bdb --001a113efc82cbc9070521834bdb Content-Type: multipart/alternative; boundary=001a113efc82cbc9030521834bd9 --001a113efc82cbc9030521834bd9 Content-Type: text/plain; charset=UTF-8 On Wed, Oct 7, 2015 at 2:47 PM, Julian Foad wrote: > Stefan wrote: > > I guess the correct way of doing this is revert Ivan's > > change and apply something like the attached patch. > Ivan wrote: > > Here is the patch that I wanted commit later. What do you think? > > I am not interested in reviewing any more patches that tweak just one > of the implementations. If you (anybody) want to do something, please > combine the two functions into one implementation, and then I will be > interested in reviewing the (single) implementation. > Alright, here you go. -- Stefan^2. --001a113efc82cbc9030521834bd9 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
On W= ed, Oct 7, 2015 at 2:47 PM, Julian Foad <julianfoad@gmail.com> wrote:
Stefan wrot= e:
> I guess the correct way of doing this is revert Ivan's
> change and apply something like the attached patch.
Ivan wrote:
> Here is the patch that I wanted commit later. What do you think?

I am not interested in reviewing any more patches that tweak just on= e
of the implementations. If you (anybody) want to do something, please
combine the two functions into one implementation, and then I will be
interested in reviewing the (single) implementation.
<= br>
Alright, here you go.

-- Stefan^2.

--001a113efc82cbc9030521834bd9-- --001a113efc82cbc9070521834bdb Content-Type: text/x-diff; charset=US-ASCII; name="stringbuf_from_stream.patch" Content-Disposition: attachment; filename="stringbuf_from_stream.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_ifgsvg4l0 SW5kZXg6IHN1YnZlcnNpb24vbGlic3ZuX3N1YnIvc3RyZWFtLmMKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gc3Vi dmVyc2lvbi9saWJzdm5fc3Vici9zdHJlYW0uYwkocmV2aXNpb24gMTcwNjYyOCkKKysrIHN1YnZl cnNpb24vbGlic3ZuX3N1YnIvc3RyZWFtLmMJKHdvcmtpbmcgY29weSkKQEAgLTE0ODgsNyArMTQ4 OCw3IEBACiB7CiAjZGVmaW5lIE1JTl9SRUFEX1NJWkUgNjQKIAotICBhcHJfc2l6ZV90IHRvX3Jl YWQgPSAwOworICBhcHJfc2l6ZV90IHRvX3JlYWQsIGdvdHRlbjsKICAgc3ZuX3N0cmluZ2J1Zl90 ICp0ZXh0CiAgICAgPSBzdm5fc3RyaW5nYnVmX2NyZWF0ZV9lbnN1cmUobGVuX2hpbnQgPyBsZW5f aGludCA6IE1JTl9SRUFEX1NJWkUsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg cmVzdWx0X3Bvb2wpOwpAQCAtMTQ5NiwxMyArMTQ5NiwxNyBAQAogICBkbwogICAgIHsKICAgICAg IHRvX3JlYWQgPSB0ZXh0LT5ibG9ja3NpemUgLSAxIC0gdGV4dC0+bGVuOwotICAgICAgU1ZOX0VS Uihzdm5fc3RyZWFtX3JlYWRfZnVsbChzdHJlYW0sIHRleHQtPmRhdGEgKyB0ZXh0LT5sZW4sICZ0 b19yZWFkKSk7Ci0gICAgICB0ZXh0LT5sZW4gKz0gdG9fcmVhZDsKKyAgICAgIGlmICh0b19yZWFk ID09IDApCisgICAgICAgIHsKKyAgICAgICAgICBzdm5fc3RyaW5nYnVmX2Vuc3VyZSh0ZXh0LCB0 ZXh0LT5ibG9ja3NpemUgKiAyKTsKKyAgICAgICAgICB0b19yZWFkID0gdGV4dC0+YmxvY2tzaXpl IC0gMSAtIHRleHQtPmxlbjsKKyAgICAgICAgfQogCi0gICAgICBpZiAodG9fcmVhZCAmJiB0ZXh0 LT5ibG9ja3NpemUgPCB0ZXh0LT5sZW4gKyBNSU5fUkVBRF9TSVpFKQotICAgICAgICBzdm5fc3Ry aW5nYnVmX2Vuc3VyZSh0ZXh0LCB0ZXh0LT5ibG9ja3NpemUgKiAyKTsKKyAgICAgIGdvdHRlbiA9 IHRvX3JlYWQ7CisgICAgICBTVk5fRVJSKHN2bl9zdHJlYW1fcmVhZF9mdWxsKHN0cmVhbSwgdGV4 dC0+ZGF0YSArIHRleHQtPmxlbiwgJmdvdHRlbikpOworICAgICAgdGV4dC0+bGVuICs9IGdvdHRl bjsKICAgICB9Ci0gIHdoaWxlICh0b19yZWFkKTsKKyAgd2hpbGUgKGdvdHRlbiA9PSB0b19yZWFk KTsKIAogICB0ZXh0LT5kYXRhW3RleHQtPmxlbl0gPSAnXDAnOwogICAqc3RyID0gdGV4dDsKQEAg LTE3OTgsMjcgKzE4MDIsMTAgQEAKICAgICAgICAgICAgICAgICAgICAgICAgYXByX3Bvb2xfdCAq cmVzdWx0X3Bvb2wsCiAgICAgICAgICAgICAgICAgICAgICAgIGFwcl9wb29sX3QgKnNjcmF0Y2hf cG9vbCkKIHsKLSAgc3ZuX3N0cmluZ2J1Zl90ICp3b3JrID0gc3ZuX3N0cmluZ2J1Zl9jcmVhdGVf ZW5zdXJlKFNWTl9fU1RSRUFNX0NIVU5LX1NJWkUsCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXN1bHRfcG9vbCk7Ci0gIGNoYXIgKmJ1ZmZl ciA9IGFwcl9wYWxsb2Moc2NyYXRjaF9wb29sLCBTVk5fX1NUUkVBTV9DSFVOS19TSVpFKTsKKyAg c3ZuX3N0cmluZ2J1Zl90IGJ1ZmZlcjsKKyAgU1ZOX0VSUihzdm5fc3RyaW5nYnVmX2Zyb21fc3Ry ZWFtKCZidWZmZXIsIHN0cmVhbSwgMCwgc2NyYXRjaF9wb29sKSk7CisgICpyZXN1bHQgPSBzdm5f c3RyaW5nX25jcmVhdGUoYnVmZmVyLmRhdGEsIGJ1ZmZlci5sZW4sIHJlc3VsdF9wb29sKTsKIAot ICB3aGlsZSAoMSkKLSAgICB7Ci0gICAgICBhcHJfc2l6ZV90IGxlbiA9IFNWTl9fU1RSRUFNX0NI VU5LX1NJWkU7Ci0KLSAgICAgIFNWTl9FUlIoc3ZuX3N0cmVhbV9yZWFkX2Z1bGwoc3RyZWFtLCBi dWZmZXIsICZsZW4pKTsKLSAgICAgIHN2bl9zdHJpbmdidWZfYXBwZW5kYnl0ZXMod29yaywgYnVm ZmVyLCBsZW4pOwotCi0gICAgICBpZiAobGVuIDwgU1ZOX19TVFJFQU1fQ0hVTktfU0laRSkKLSAg ICAgICAgYnJlYWs7Ci0gICAgfQotCi0gIFNWTl9FUlIoc3ZuX3N0cmVhbV9jbG9zZShzdHJlYW0p KTsKLQotICAqcmVzdWx0ID0gYXByX3BhbGxvYyhyZXN1bHRfcG9vbCwgc2l6ZW9mKCoqcmVzdWx0 KSk7Ci0gICgqcmVzdWx0KS0+ZGF0YSA9IHdvcmstPmRhdGE7Ci0gICgqcmVzdWx0KS0+bGVuID0g d29yay0+bGVuOwotCiAgIHJldHVybiBTVk5fTk9fRVJST1I7CiB9CiAK --001a113efc82cbc9070521834bdb--