1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00

Debug message cleanups.

This commit is contained in:
Werner Koch 2002-04-27 13:50:16 +00:00
parent 8460fb4a73
commit 0ec648b71f
5 changed files with 18 additions and 7 deletions

View File

@ -1,3 +1,11 @@
2002-04-26 Werner Koch <wk@gnupg.org>
* gpgsm.h (DBG_AGENT,DBG_AGENT_VALUE): Replaced by DBG_ASSUAN_*.
Changed all users.
* call-agent.c (start_agent): Be more silent without -v.
* call-dirmngr.c (start_dirmngr): Ditto.
2002-04-25 Werner Koch <wk@gnupg.org> 2002-04-25 Werner Koch <wk@gnupg.org>
* call-agent.c (start_agent): Make copies of old locales and check * call-agent.c (start_agent): Make copies of old locales and check

View File

@ -151,7 +151,9 @@ start_agent (void)
{ {
const char *pgmname; const char *pgmname;
const char *argv[3]; const char *argv[3];
log_info (_("no running gpg-agent - starting one\n"));
if (opt.verbose)
log_info (_("no running gpg-agent - starting one\n"));
if (fflush (NULL)) if (fflush (NULL))
{ {
@ -217,7 +219,7 @@ start_agent (void)
} }
agent_ctx = ctx; agent_ctx = ctx;
if (DBG_AGENT) if (DBG_ASSUAN)
log_debug ("connection to agent established\n"); log_debug ("connection to agent established\n");
rc = assuan_transact (agent_ctx, "RESET", NULL, NULL, NULL, NULL, NULL, NULL); rc = assuan_transact (agent_ctx, "RESET", NULL, NULL, NULL, NULL, NULL, NULL);

View File

@ -70,7 +70,8 @@ start_dirmngr (void)
const char *pgmname; const char *pgmname;
const char *argv[3]; const char *argv[3];
log_info (_("no running dirmngr - starting one\n")); if (opt.verbose)
log_info (_("no running dirmngr - starting one\n"));
if (fflush (NULL)) if (fflush (NULL))
{ {
@ -136,7 +137,7 @@ start_dirmngr (void)
} }
dirmngr_ctx = ctx; dirmngr_ctx = ctx;
if (DBG_AGENT) if (DBG_ASSUAN)
log_debug ("connection to dirmngr established\n"); log_debug ("connection to dirmngr established\n");
return 0; return 0;
} }

View File

@ -89,14 +89,14 @@ struct {
#define DBG_CACHE_VALUE 64 /* debug the caching */ #define DBG_CACHE_VALUE 64 /* debug the caching */
#define DBG_MEMSTAT_VALUE 128 /* show memory statistics */ #define DBG_MEMSTAT_VALUE 128 /* show memory statistics */
#define DBG_HASHING_VALUE 512 /* debug hashing operations */ #define DBG_HASHING_VALUE 512 /* debug hashing operations */
#define DBG_AGENT_VALUE 1024 /* debug communication with the agent */ #define DBG_ASSUAN_VALUE 1024 /* debug assuan communication */
#define DBG_X509 (opt.debug & DBG_X509_VALUE) #define DBG_X509 (opt.debug & DBG_X509_VALUE)
#define DBG_CRYPTO (opt.debug & DBG_CRYPTO_VALUE) #define DBG_CRYPTO (opt.debug & DBG_CRYPTO_VALUE)
#define DBG_MEMORY (opt.debug & DBG_MEMORY_VALUE) #define DBG_MEMORY (opt.debug & DBG_MEMORY_VALUE)
#define DBG_CACHE (opt.debug & DBG_CACHE_VALUE) #define DBG_CACHE (opt.debug & DBG_CACHE_VALUE)
#define DBG_HASHING (opt.debug & DBG_HASHING_VALUE) #define DBG_HASHING (opt.debug & DBG_HASHING_VALUE)
#define DBG_AGENT (opt.debug & DBG_AGENT_VALUE) #define DBG_ASSUAN (opt.debug & DBG_ASSUAN_VALUE)
struct server_local_s; struct server_local_s;

View File

@ -655,7 +655,7 @@ gpgsm_server (void)
ctrl.server_local->assuan_ctx = ctx; ctrl.server_local->assuan_ctx = ctx;
ctrl.server_local->message_fd = -1; ctrl.server_local->message_fd = -1;
if (DBG_AGENT) if (DBG_ASSUAN)
assuan_set_log_stream (ctx, log_get_stream ()); assuan_set_log_stream (ctx, log_get_stream ());
for (;;) for (;;)