← Back to branch summary

~ubuntu-branches/ubuntu/quantal/gnupg2/quantal-proposed

« back to all changes in this revision

Viewing changes to g10/parse-packet.c

  • Committer: Bazaar Package Importer
  • Author(s): Marc Deslauriers
  • Date: 2011-05-25 14:27:35 UTC
  • mfrom: (1.1.15 upstream) (7.1.7 sid)
  • Revision ID: james.westby@ubuntu.com-20110525142735-jccyw0fopnyv728q
Tags: 2.0.17-2ubuntu1
* Merge from debian unstable. Remaining changes:
  - Add udev rules to give gpg access to some smartcard readers;
    Debian #543217.
    . debian/gnupg2.dev: udev rules to set ACLs on SCM smartcard readers.
    . debian/rules: Call dh_installudev.
  - debian/control: Rename Vcs-* to XS-Debian-Vcs-*.

Show diffs side-by-side

added added

removed removed

Lines of Context:
g10/parse-packet.c
682
682
          else
683
683
            {
684
684
              for( ; pktlen; pktlen-- )
685
 
                dump_hex_line(iobuf_get(inp), &i);
 
685
                {
 
686
                  dump_hex_line ((c=iobuf_get(inp)), &i);
 
687
                  if (c == -1)
 
688
                    break;
 
689
                }
686
690
            }
687
691
          putc ('\n', listfp);
688
692
          return;
2529
2533
        }
2530
2534
        else {
2531
2535
            for( ; pktlen; pktlen-- )
2532
 
                dump_hex_line(iobuf_get(inp), &i);
 
2536
              {
 
2537
                dump_hex_line ((c=iobuf_get (inp)), &i);
 
2538
                if (c == -1)
 
2539
                  break;
 
2540
              }
2533
2541
        }
2534
2542
        putc ('\n', listfp);
2535
2543
    }