← Back to branch summary

~ubuntu-branches/ubuntu/feisty/gnupg2/feisty

« back to all changes in this revision

Viewing changes to kbx/keybox-openpgp.c

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2006-11-24 18:48:23 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20061124184823-17ir9m46tl09n9k4
Tags: 2.0.0-4ubuntu1
* Synchronize to Debian, reapply remaining Ubuntu changes to pristine Debian
  version:
  - Remove libpcsclite-dev, libopensc2-dev build dependencies (they are in
    universe).

Show diffs side-by-side

added added

removed removed

Lines of Context:
kbx/keybox-openpgp.c
405
405
              u = xtrycalloc (1, sizeof *u);
406
406
              if (!u)
407
407
                {
408
 
                  err = gpg_error_from_errno (errno);
 
408
                  err = gpg_error_from_syserror ();
409
409
                  break;
410
410
                }
411
411
              u->off = data - image_start;
447
447
              k = xtrycalloc (1, sizeof *k);
448
448
              if (!k)
449
449
                {
450
 
                  err = gpg_error_from_errno (errno);
 
450
                  err = gpg_error_from_syserror ();
451
451
                  break;
452
452
                }
453
453
              err = parse_key (data, datalen, k);