From c3f08dcb7266efeac84f5f720ec0a353a45e950d Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 9 Jun 2010 16:53:51 +0000 Subject: Merged Dirmngr with GnuPG. A few code changes to support dirmngr. --- scd/ChangeLog | 5 +++++ scd/scdaemon.c | 11 ++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) (limited to 'scd') diff --git a/scd/ChangeLog b/scd/ChangeLog index 3bb00f178..7578b7fc2 100644 --- a/scd/ChangeLog +++ b/scd/ChangeLog @@ -1,3 +1,8 @@ +2010-06-09 Werner Koch + + * scdaemon.c (main): s/log_set_get_tid_callback/log_set_pid_suffix_cb/. + (tid_log_callback): Adjust for this change. + 2010-03-11 Werner Koch * scdaemon.c: Include "asshelp.h". diff --git a/scd/scdaemon.c b/scd/scdaemon.c index e5d8ea911..93fc58a93 100644 --- a/scd/scdaemon.c +++ b/scd/scdaemon.c @@ -269,14 +269,15 @@ my_strusage (int level) } -static unsigned long -tid_log_callback (void) +static int +tid_log_callback (unsigned long *rvalue) { #ifdef PTH_HAVE_PTH_THREAD_ID - return pth_thread_id (); + *rvalue = pth_thread_id (); #else - return (unsigned long)pth_self (); + *rvalue = (unsigned long)pth_self (); #endif + return 2; /* Use use hex representation. */ } @@ -551,7 +552,7 @@ main (int argc, char **argv ) break; case oDebugDisableTicker: ticker_disabled = 1; break; case oDebugLogTid: - log_set_get_tid_callback (tid_log_callback); + log_set_pid_suffix_cb (tid_log_callback); break; case oOptions: -- cgit v1.2.3