Finished the bulk of changes for gnupg 1.9. This included switching

to libgcrypt functions, using shared error codes from libgpg-error,
replacing the old functions we used to have in ../util by those in
../jnlib and ../common, renaming the malloc functions and a couple of
types.  Note, that not all changes are listed below becuause they are
too similar and done at far too many places.  As of today the code
builds using the current libgcrypt from CVS but it is very unlikely
that it actually works.

1 files changed, 4 insertions, 4 deletions

diff --git a/scd/command.c b/scd/command.c
index 6c30d3de7..8267c13ab 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -317,7 +317,7 @@ cmd_readcert (ASSUAN_CONTEXT ctx, char *line)
   rc = card_read_cert (ctrl->card_ctx, line, &cert, &ncert);
   if (rc)
     {
-      log_error ("card_read_cert failed: %s\n", gnupg_strerror (rc));
+      log_error ("card_read_cert failed: %s\n", gpg_strerror (rc));
     }
   if (!rc)
     {
@@ -351,7 +351,7 @@ cmd_readkey (ASSUAN_CONTEXT ctx, char *line)
   rc = card_read_cert (ctrl->card_ctx, line, &cert, &ncert);
   if (rc)
     {
-      log_error ("card_read_cert failed: %s\n", gnupg_strerror (rc));
+      log_error ("card_read_cert failed: %s\n", gpg_strerror (rc));
       goto leave;
     }
       
@@ -488,7 +488,7 @@ cmd_pksign (ASSUAN_CONTEXT ctx, char *line)
   free (keyidstr);
   if (rc)
     {
-      log_error ("card_sign failed: %s\n", gnupg_strerror (rc));
+      log_error ("card_sign failed: %s\n", gpg_strerror (rc));
     }
   else
     {
@@ -527,7 +527,7 @@ cmd_pkdecrypt (ASSUAN_CONTEXT ctx, char *line)
   free (keyidstr);
   if (rc)
     {
-      log_error ("card_create_signature failed: %s\n", gnupg_strerror (rc));
+      log_error ("card_create_signature failed: %s\n", gpg_strerror (rc));
     }
   else
     {