Questionable / Incorrect Code

[Joshua Rogers]

On 25/12/14 07:10, Werner Koch wrote:
> On Wed, 24 Dec 2014 14:41, git at internot.info said:
>
>> > I probably explained that terribly. I'm very tired. But if you look at
>> > line 2340 you'll see what I mean.
> Indeed that looks like a faulty merge.  We need to go back and see why
> it happened.
It was introduced in commit 7a7a59782766a8bde0c3e7156d14bb2b0e4a3951, by
Marcus Brinkmann, just for reference.


> 26b4a012 (NIIBE Yutaka     2011-11-28 16:16:38 +0900 2337)   xfree
> (pin_verify);
> 26b4a012 (NIIBE Yutaka     2011-11-28 16:16:38 +0900 2338)   if (sw ||
> resultlen < 2)
> 7a7a5978 (Marcus Brinkmann 2012-01-03 22:12:37 +0100 2339)     return
> sw? sw : SW_HOST_INCOMPLETE_CARD_RESPONSE;
> 7a7a5978 (Marcus Brinkmann 2012-01-03 22:12:37 +0100 2340)   sw =
> (result[resultlen-2] << 8) | result[resultlen-1];
> 07f20f31 (NIIBE Yutaka     2011-12-20 13:34:27 +0900 2341)     {
> 07f20f31 (NIIBE Yutaka     2011-12-20 13:34:27 +0900 2342)      
> log_error ("control_pcsc failed: %d\n", sw);


I see no reason as to why a faluty merge would have caused that, though.
It looks like a copy and paste gone stray to me, since the exact same
code it below that. It doesn't really matter, though.

The commit log is as followed:

> commit 7a7a59782766a8bde0c3e7156d14bb2b0e4a3951
> Author: Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
> Date:   Tue Jan 3 22:12:37 2012 +0100
>
>     Port to npth.
>     
>     * configure.ac: Don't check for PTH but for NPTH.
>     (AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
>     (have_pth): Rename to ...
>     (have_npth): ... this.
>     (USE_GNU_NPTH): Rename to ...
>     (USE_GNU_PTH): ... this.
>     * m4/npth.m4: New file.
>     * agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
>     agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
>     agent/trustlist.c, common/Makefile.am, common/estream.c,
>     common/exechelp-posix.c, common/exechelp-w32.c,
>     common/exechelp-w32ce.c, common/http.c, common/init.c,
>     common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
>     dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
>     dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
>     g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
>     scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
>     scd/scdaemon.c, tools/Makefile.am: Port to npth.



Thanks,
-- 
-- Joshua Rogers <https://internot.info/>

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: </pipermail/attachments/20141225/960cf4c3/attachment.sig>