security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

gpg: Replace remaining old error code macros by GPG_ERR_.

Browse source 
* g10/gpg.h (g10_errstr): Remove macro and change all occurrences by
gpg_strerror.
(G10ERR_): Remove all macros and change all occurrences by their
GPG_ERR_ counterparts.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2015-01-22 12:06:11 +01:00
parent a23c30fb59
commit 11142e0ad7
32 changed files with 362 additions and 408 deletions
Download patch file Download diff file Expand all files Collapse all files

43
g10/gpg.c
View file

@ -3529,7 +3529,8 @@ main (int argc, char **argv)
break;
}
if (rc)
log_error (_("failed to initialize the TrustDB: %s\n"), g10_errstr(rc));
log_error (_("failed to initialize the TrustDB: %s\n"),
gpg_strerror (rc));
#endif /*!NO_TRUST_MODELS*/
switch (cmd)
@ -3597,14 +3598,14 @@ main (int argc, char **argv)
wrong_args(_("--store [filename]"));
if( (rc = encrypt_store(fname)) )
log_error ("storing '%s' failed: %s\n",
print_fname_stdin(fname),g10_errstr(rc) );
print_fname_stdin(fname),gpg_strerror (rc) );
break;
case aSym: /* encrypt the given file only with the symmetric cipher */
if( argc > 1 )
wrong_args(_("--symmetric [filename]"));
if( (rc = encrypt_symmetric(fname)) )
log_error (_("symmetric encryption of '%s' failed: %s\n"),
print_fname_stdin(fname),g10_errstr(rc) );
print_fname_stdin(fname),gpg_strerror (rc) );
break;
case aEncr: /* encrypt the given file */
@ -3616,7 +3617,7 @@ main (int argc, char **argv)
wrong_args(_("--encrypt [filename]"));
if( (rc = encrypt_crypt (ctrl, -1, fname, remusr, 0, NULL, -1)) )
log_error("%s: encryption failed: %s\n",
print_fname_stdin(fname), g10_errstr(rc) );
print_fname_stdin(fname), gpg_strerror (rc) );
}
break;
@ -3637,7 +3638,7 @@ main (int argc, char **argv)
{
if( (rc = encrypt_crypt (ctrl, -1, fname, remusr, 1, NULL, -1)) )
log_error("%s: encryption failed: %s\n",
print_fname_stdin(fname), g10_errstr(rc) );
print_fname_stdin(fname), gpg_strerror (rc) );
}
break;
@ -3656,7 +3657,7 @@ main (int argc, char **argv)
}
}
if( (rc = sign_file (ctrl, sl, detached_sig, locusr, 0, NULL, NULL)) )
log_error("signing failed: %s\n", g10_errstr(rc) );
log_error("signing failed: %s\n", gpg_strerror (rc) );
free_strlist(sl);
break;
@ -3671,7 +3672,7 @@ main (int argc, char **argv)
sl = NULL;
if ((rc = sign_file (ctrl, sl, detached_sig, locusr, 1, remusr, NULL)))
log_error("%s: sign+encrypt failed: %s\n",
print_fname_stdin(fname), g10_errstr(rc) );
print_fname_stdin(fname), gpg_strerror (rc) );
free_strlist(sl);
break;
@ -3696,7 +3697,7 @@ main (int argc, char **argv)
if ((rc = sign_file (ctrl, sl, detached_sig, locusr,
2, remusr, NULL)))
log_error("%s: symmetric+sign+encrypt failed: %s\n",
print_fname_stdin(fname), g10_errstr(rc) );
print_fname_stdin(fname), gpg_strerror (rc) );
free_strlist(sl);
}
break;
@ -3707,7 +3708,7 @@ main (int argc, char **argv)
rc = sign_symencrypt_file (fname, locusr);
if (rc)
log_error("%s: sign+symmetric failed: %s\n",
print_fname_stdin(fname), g10_errstr(rc) );
print_fname_stdin(fname), gpg_strerror (rc) );
break;
case aClearsign: /* make a clearsig */
@ -3715,19 +3716,19 @@ main (int argc, char **argv)
wrong_args(_("--clearsign [filename]"));
if( (rc = clearsign_file(fname, locusr, NULL)) )
log_error("%s: clearsign failed: %s\n",
print_fname_stdin(fname), g10_errstr(rc) );
print_fname_stdin(fname), gpg_strerror (rc) );
break;
case aVerify:
if (multifile)
{
if ((rc = verify_files (ctrl, argc, argv)))
log_error("verify files failed: %s\n", g10_errstr(rc) );
log_error("verify files failed: %s\n", gpg_strerror (rc) );
}
else
{
if ((rc = verify_signatures (ctrl, argc, argv)))
log_error("verify signatures failed: %s\n", g10_errstr(rc) );
log_error("verify signatures failed: %s\n", gpg_strerror (rc) );
}
break;
@ -3739,7 +3740,7 @@ main (int argc, char **argv)
if( argc > 1 )
wrong_args(_("--decrypt [filename]"));
if( (rc = decrypt_message (ctrl, fname) ))
log_error("decrypt_message failed: %s\n", g10_errstr(rc) );
log_error("decrypt_message failed: %s\n", gpg_strerror (rc) );
}
break;
@ -3912,11 +3913,11 @@ main (int argc, char **argv)
if(rc)
{
if(cmd==aSendKeys)
log_error(_("keyserver send failed: %s\n"),g10_errstr(rc));
log_error(_("keyserver send failed: %s\n"),gpg_strerror (rc));
else if(cmd==aRecvKeys)
log_error(_("keyserver receive failed: %s\n"),g10_errstr(rc));
log_error(_("keyserver receive failed: %s\n"),gpg_strerror (rc));
else
log_error(_("key export failed: %s\n"),g10_errstr(rc));
log_error(_("key export failed: %s\n"),gpg_strerror (rc));
}
free_strlist(sl);
break;
@ -3937,7 +3938,7 @@ main (int argc, char **argv)
append_to_strlist2( &sl, *argv, utf8_strings );
rc = keyserver_refresh (ctrl, sl);
if(rc)
log_error(_("keyserver refresh failed: %s\n"),g10_errstr(rc));
log_error(_("keyserver refresh failed: %s\n"),gpg_strerror (rc));
free_strlist(sl);
break;
@ -3947,7 +3948,7 @@ main (int argc, char **argv)
append_to_strlist2( &sl, *argv, utf8_strings );
rc = keyserver_fetch (ctrl, sl);
if(rc)
log_error("key fetch failed: %s\n",g10_errstr(rc));
log_error("key fetch failed: %s\n",gpg_strerror (rc));
free_strlist(sl);
break;
@ -3988,7 +3989,7 @@ main (int argc, char **argv)
wrong_args("--dearmor [file]");
rc = dearmor_file( argc? *argv: NULL );
if( rc )
log_error(_("dearmoring failed: %s\n"), g10_errstr(rc));
log_error(_("dearmoring failed: %s\n"), gpg_strerror (rc));
break;
case aEnArmor:
@ -3996,7 +3997,7 @@ main (int argc, char **argv)
wrong_args("--enarmor [file]");
rc = enarmor_file( argc? *argv: NULL );
if( rc )
log_error(_("enarmoring failed: %s\n"), g10_errstr(rc));
log_error(_("enarmoring failed: %s\n"), gpg_strerror (rc));
break;
@ -4235,7 +4236,7 @@ main (int argc, char **argv)
}
rc = proc_packets (ctrl, NULL, a );
if( rc )
log_error("processing message failed: %s\n", g10_errstr(rc) );
log_error("processing message failed: %s\n", gpg_strerror (rc));
iobuf_close(a);
}
break;