mirror of
git://git.gnupg.org/gnupg.git
synced 2025-01-03 12:11:33 +01:00
Call log_set_prefix() with human-readable labels.
* agent/preset-passphrase.c, agent/protect-tool.c, dirmngr/dirmngr.c * dirmngr/t-http.c, g10/gpg.c, g10/gpgv.c, g13/g13-syshelp.c * g13/g13.c, kbx/kbxutil.c, scd/scdaemon.c, sm/gpgsm.c * tests/gpgscm/main.c, tools/gpg-check-pattern.c * tools/gpg-connect-agent.c, tools/gpgconf.c, tools/gpgtar.c * tools/symcryptrun.c: Invoke log_set_prefix() with human-readable labels. -- Some invocations of log_set_prefix() were done with raw numeric values instead of values that humans can understand. Use symbolic representations instead of numeric for better readability. Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
This commit is contained in:
parent
70b5d7c43a
commit
61c2a1fa6d
@ -208,7 +208,7 @@ main (int argc, char **argv)
|
||||
|
||||
early_system_init ();
|
||||
set_strusage (my_strusage);
|
||||
log_set_prefix ("gpg-preset-passphrase", 1);
|
||||
log_set_prefix ("gpg-preset-passphrase", GPGRT_LOG_WITH_PREFIX);
|
||||
|
||||
/* Make sure that our subsystems are ready. */
|
||||
i18n_init ();
|
||||
|
@ -560,7 +560,7 @@ main (int argc, char **argv )
|
||||
early_system_init ();
|
||||
set_strusage (my_strusage);
|
||||
gcry_control (GCRYCTL_SUSPEND_SECMEM_WARN);
|
||||
log_set_prefix ("gpg-protect-tool", 1);
|
||||
log_set_prefix ("gpg-protect-tool", GPGRT_LOG_WITH_PREFIX);
|
||||
|
||||
/* Make sure that our subsystems are ready. */
|
||||
i18n_init ();
|
||||
|
@ -743,7 +743,7 @@ main (int argc, char **argv)
|
||||
#endif /*USE_W32_SERVICE*/
|
||||
|
||||
set_strusage (my_strusage);
|
||||
log_set_prefix (DIRMNGR_NAME, 1|4);
|
||||
log_set_prefix (DIRMNGR_NAME, GPGRT_LOG_WITH_PREFIX | GPGRT_LOG_WITH_PID);
|
||||
|
||||
/* Make sure that our subsystems are ready. */
|
||||
i18n_init ();
|
||||
@ -1073,7 +1073,7 @@ main (int argc, char **argv)
|
||||
if (logfile)
|
||||
{
|
||||
log_set_file (logfile);
|
||||
log_set_prefix (NULL, 2|4);
|
||||
log_set_prefix (NULL, GPGRT_LOG_WITH_TIME | GPGRT_LOG_WITH_PID);
|
||||
}
|
||||
|
||||
if (debug_wait)
|
||||
|
@ -154,7 +154,7 @@ main (int argc, char **argv)
|
||||
http_session_t session = NULL;
|
||||
|
||||
gpgrt_init ();
|
||||
log_set_prefix (PGM, 1 | 4);
|
||||
log_set_prefix (PGM, GPGRT_LOG_WITH_PREFIX | GPGRT_LOG_WITH_PID);
|
||||
if (argc)
|
||||
{ argc--; argv++; }
|
||||
while (argc && last_argc != argc )
|
||||
|
@ -2171,7 +2171,7 @@ main (int argc, char **argv)
|
||||
gnupg_rl_initialize ();
|
||||
set_strusage (my_strusage);
|
||||
gcry_control (GCRYCTL_SUSPEND_SECMEM_WARN);
|
||||
log_set_prefix (GPG_NAME, 1);
|
||||
log_set_prefix (GPG_NAME, GPGRT_LOG_WITH_PREFIX);
|
||||
|
||||
/* Make sure that our subsystems are ready. */
|
||||
i18n_init();
|
||||
@ -3429,7 +3429,7 @@ main (int argc, char **argv)
|
||||
if (logfile && opt.batch)
|
||||
{
|
||||
log_set_file (logfile);
|
||||
log_set_prefix (NULL, 1|2|4);
|
||||
log_set_prefix (NULL, GPGRT_LOG_WITH_PREFIX | GPGRT_LOG_WITH_TIME | GPGRT_LOG_WITH_PID);
|
||||
}
|
||||
|
||||
if (opt.verbose > 2)
|
||||
|
@ -149,7 +149,7 @@ main( int argc, char **argv )
|
||||
|
||||
early_system_init ();
|
||||
set_strusage (my_strusage);
|
||||
log_set_prefix ("gpgv", 1);
|
||||
log_set_prefix ("gpgv", GPGRT_LOG_WITH_PREFIX);
|
||||
|
||||
/* Make sure that our subsystems are ready. */
|
||||
i18n_init();
|
||||
|
@ -244,7 +244,7 @@ main ( int argc, char **argv)
|
||||
set_strusage (my_strusage);
|
||||
gcry_control (GCRYCTL_SUSPEND_SECMEM_WARN);
|
||||
|
||||
log_set_prefix (G13_NAME "-syshelp", 1);
|
||||
log_set_prefix (G13_NAME "-syshelp", GPGRT_LOG_WITH_PREFIX);
|
||||
|
||||
/* Make sure that our subsystems are ready. */
|
||||
i18n_init ();
|
||||
@ -437,7 +437,7 @@ main ( int argc, char **argv)
|
||||
if (logfile)
|
||||
{
|
||||
log_set_file (logfile);
|
||||
log_set_prefix (NULL, 1|2|4);
|
||||
log_set_prefix (NULL, GPGRT_LOG_WITH_PREFIX | GPGRT_LOG_WITH_TIME | GPGRT_LOG_WITH_PID);
|
||||
}
|
||||
|
||||
if (gnupg_faked_time_p ())
|
||||
|
@ -364,7 +364,7 @@ main ( int argc, char **argv)
|
||||
set_strusage (my_strusage);
|
||||
gcry_control (GCRYCTL_SUSPEND_SECMEM_WARN);
|
||||
|
||||
log_set_prefix (G13_NAME, 1);
|
||||
log_set_prefix (G13_NAME, GPGRT_LOG_WITH_PREFIX);
|
||||
|
||||
/* Make sure that our subsystems are ready. */
|
||||
i18n_init ();
|
||||
@ -655,7 +655,7 @@ main ( int argc, char **argv)
|
||||
if (logfile)
|
||||
{
|
||||
log_set_file (logfile);
|
||||
log_set_prefix (NULL, 1|2|4);
|
||||
log_set_prefix (NULL, GPGRT_LOG_WITH_PREFIX | GPGRT_LOG_WITH_TIME | GPGRT_LOG_WITH_PID);
|
||||
}
|
||||
|
||||
if (gnupg_faked_time_p ())
|
||||
|
@ -454,7 +454,7 @@ main( int argc, char **argv )
|
||||
early_system_init ();
|
||||
set_strusage( my_strusage );
|
||||
gcry_control (GCRYCTL_DISABLE_SECMEM);
|
||||
log_set_prefix ("kbxutil", 1);
|
||||
log_set_prefix ("kbxutil", GPGRT_LOG_WITH_PREFIX);
|
||||
|
||||
/* Make sure that our subsystems are ready. */
|
||||
i18n_init ();
|
||||
|
@ -416,7 +416,7 @@ main (int argc, char **argv )
|
||||
/* Please note that we may running SUID(ROOT), so be very CAREFUL
|
||||
when adding any stuff between here and the call to INIT_SECMEM()
|
||||
somewhere after the option parsing */
|
||||
log_set_prefix ("scdaemon", 1|4);
|
||||
log_set_prefix ("scdaemon", GPGRT_LOG_WITH_PREFIX | GPGRT_LOG_WITH_PID);
|
||||
|
||||
/* Make sure that our subsystems are ready. */
|
||||
i18n_init ();
|
||||
@ -695,7 +695,7 @@ main (int argc, char **argv )
|
||||
if (logfile)
|
||||
{
|
||||
log_set_file (logfile);
|
||||
log_set_prefix (NULL, 1|2|4);
|
||||
log_set_prefix (NULL, GPGRT_LOG_WITH_PREFIX | GPGRT_LOG_WITH_TIME | GPGRT_LOG_WITH_PID);
|
||||
}
|
||||
|
||||
if (debug_wait && pipe_server)
|
||||
|
@ -930,7 +930,7 @@ main ( int argc, char **argv)
|
||||
/* Please note that we may running SUID(ROOT), so be very CAREFUL
|
||||
when adding any stuff between here and the call to secmem_init()
|
||||
somewhere after the option parsing */
|
||||
log_set_prefix (GPGSM_NAME, 1);
|
||||
log_set_prefix (GPGSM_NAME, GPGRT_LOG_WITH_PREFIX);
|
||||
|
||||
/* Make sure that our subsystems are ready. */
|
||||
i18n_init ();
|
||||
@ -1507,7 +1507,7 @@ main ( int argc, char **argv)
|
||||
if (logfile && cmd == aServer)
|
||||
{
|
||||
log_set_file (logfile);
|
||||
log_set_prefix (NULL, 1|2|4);
|
||||
log_set_prefix (NULL, GPGRT_LOG_WITH_PREFIX | GPGRT_LOG_WITH_TIME | GPGRT_LOG_WITH_PID);
|
||||
}
|
||||
|
||||
if (gnupg_faked_time_p ())
|
||||
|
@ -216,7 +216,7 @@ main (int argc, char **argv)
|
||||
*p = 0, scmpath_len++;
|
||||
|
||||
set_strusage (my_strusage);
|
||||
log_set_prefix ("gpgscm", 1);
|
||||
log_set_prefix ("gpgscm", GPGRT_LOG_WITH_PREFIX);
|
||||
|
||||
/* Make sure that our subsystems are ready. */
|
||||
i18n_init ();
|
||||
|
@ -165,7 +165,7 @@ main (int argc, char **argv )
|
||||
early_system_init ();
|
||||
set_strusage (my_strusage);
|
||||
gcry_control (GCRYCTL_SUSPEND_SECMEM_WARN);
|
||||
log_set_prefix ("gpg-check-pattern", 1);
|
||||
log_set_prefix ("gpg-check-pattern", GPGRT_LOG_WITH_PREFIX);
|
||||
|
||||
/* Make sure that our subsystems are ready. */
|
||||
i18n_init ();
|
||||
|
@ -1172,7 +1172,7 @@ main (int argc, char **argv)
|
||||
early_system_init ();
|
||||
gnupg_rl_initialize ();
|
||||
set_strusage (my_strusage);
|
||||
log_set_prefix ("gpg-connect-agent", 1);
|
||||
log_set_prefix ("gpg-connect-agent", GPGRT_LOG_WITH_PREFIX);
|
||||
|
||||
/* Make sure that our subsystems are ready. */
|
||||
i18n_init();
|
||||
|
@ -223,7 +223,7 @@ main (int argc, char **argv)
|
||||
early_system_init ();
|
||||
gnupg_reopen_std (GPGCONF_NAME);
|
||||
set_strusage (my_strusage);
|
||||
log_set_prefix (GPGCONF_NAME, 1);
|
||||
log_set_prefix (GPGCONF_NAME, GPGRT_LOG_WITH_PREFIX);
|
||||
|
||||
/* Make sure that our subsystems are ready. */
|
||||
i18n_init();
|
||||
|
@ -416,7 +416,7 @@ main (int argc, char **argv)
|
||||
|
||||
gnupg_reopen_std (GPGTAR_NAME);
|
||||
set_strusage (my_strusage);
|
||||
log_set_prefix (GPGTAR_NAME, 1);
|
||||
log_set_prefix (GPGTAR_NAME, GPGRT_LOG_WITH_PREFIX);
|
||||
|
||||
/* Make sure that our subsystems are ready. */
|
||||
i18n_init();
|
||||
|
@ -886,7 +886,7 @@ main (int argc, char **argv)
|
||||
|
||||
early_system_init ();
|
||||
set_strusage (my_strusage);
|
||||
log_set_prefix ("symcryptrun", 1);
|
||||
log_set_prefix ("symcryptrun", GPGRT_LOG_WITH_PREFIX);
|
||||
|
||||
/* Make sure that our subsystems are ready. */
|
||||
i18n_init();
|
||||
|
Loading…
x
Reference in New Issue
Block a user