mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
Make use of the *_NAME etc macros.
Replace hardwired strings at many places with new macros from config.h and use the new strusage macro replacement feature. * common/asshelp.c (lock_spawning) [W32]: Change the names of the spawn sentinels. * agent/command.c (cmd_import_key): Use asprintf to create the prompt.
This commit is contained in:
parent
798daaa1dd
commit
cc9a0b69b6
48 changed files with 355 additions and 320 deletions
|
@ -455,7 +455,7 @@ build_attrs(LDAPMod ***modlist,char *line)
|
|||
case 'R':
|
||||
revoked=1;
|
||||
break;
|
||||
|
||||
|
||||
case 'd':
|
||||
case 'D':
|
||||
disabled=1;
|
||||
|
@ -1037,7 +1037,7 @@ get_key(char *getkey)
|
|||
else
|
||||
{
|
||||
/* short key id */
|
||||
|
||||
|
||||
sprintf(search,"(pgpkeyid=%.8s)",getkey);
|
||||
}
|
||||
|
||||
|
@ -1767,12 +1767,12 @@ find_basekeyspacedn(void)
|
|||
}
|
||||
|
||||
ldap_msgfree(si_res);
|
||||
}
|
||||
}
|
||||
|
||||
return LDAP_SUCCESS;
|
||||
}
|
||||
|
||||
static void
|
||||
static void
|
||||
show_help (FILE *fp)
|
||||
{
|
||||
fprintf (fp,"-h, --help\thelp\n");
|
||||
|
@ -1794,7 +1794,7 @@ main(int argc,char *argv[])
|
|||
/* Kludge to implement standard GNU options. */
|
||||
if (argc > 1 && !strcmp (argv[1], "--version"))
|
||||
{
|
||||
fputs ("gpgkeys_ldap (GnuPG) " VERSION"\n", stdout);
|
||||
fputs ("gpgkeys_ldap ("GNUPG_NAME") " VERSION"\n", stdout);
|
||||
return 0;
|
||||
}
|
||||
else if (argc > 1 && !strcmp (argv[1], "--help"))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue