From 2ba4dc7998d30c06f17b5085e18eb4aedac40bb0 Mon Sep 17 00:00:00 2001
From: Marcus Brinkmann <mb@g10code.com>
Date: Wed, 28 Aug 2002 17:29:32 +0000
Subject: [PATCH] 2002-08-21  Marcus Brinkmann  <marcus@g10code.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

	* encrypt-sign.c (encrypt_sign_status_handler): Remove dead
	variables encrypt_info and encrypt_info_len.
	* trustlist.c (gpgme_op_trustlist_start): Set colon line handler.
	* posix-sema.c (sema_fatal): Remove function.
	All these reported by St�phane Corth�sy.
---
 gpgme/ChangeLog      | 8 ++++++++
 gpgme/encrypt-sign.c | 3 ---
 gpgme/posix-sema.c   | 7 -------
 gpgme/trustlist.c    | 2 ++
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 30edecd2..93790330 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,11 @@
+2002-08-21  Marcus Brinkmann  <marcus@g10code.de>
+
+	* encrypt-sign.c (encrypt_sign_status_handler): Remove dead
+	variables encrypt_info and encrypt_info_len.
+	* trustlist.c (gpgme_op_trustlist_start): Set colon line handler.
+	* posix-sema.c (sema_fatal): Remove function.
+	All these reported by Stéphane Corthésy.
+
 2002-08-23  Werner Koch  <wk@gnupg.org>
 
 	* gpgme-config.in: Made --prefix work for --libs. 
diff --git a/gpgme/encrypt-sign.c b/gpgme/encrypt-sign.c
index 9e49e584..39ec6d14 100644
--- a/gpgme/encrypt-sign.c
+++ b/gpgme/encrypt-sign.c
@@ -36,9 +36,6 @@
 static void
 encrypt_sign_status_handler (GpgmeCtx ctx, GpgmeStatusCode code, char *args)
 {
-  char *encrypt_info = 0;
-  size_t encrypt_info_len;
-
   _gpgme_encrypt_status_handler (ctx, code, args);
   _gpgme_sign_status_handler (ctx, code, args);
 }
diff --git a/gpgme/posix-sema.c b/gpgme/posix-sema.c
index 2a41922a..30a4ad68 100644
--- a/gpgme/posix-sema.c
+++ b/gpgme/posix-sema.c
@@ -37,13 +37,6 @@
 #include "sema.h"
 #include "ath.h"
 
-static void
-sema_fatal (const char *text)
-{
-  fprintf (stderr, "sema.c: %s\n", text);
-  abort ();
-}
-
 void
 _gpgme_sema_subsystem_init ()
 {
diff --git a/gpgme/trustlist.c b/gpgme/trustlist.c
index 55fdfdf7..43edfe53 100644
--- a/gpgme/trustlist.c
+++ b/gpgme/trustlist.c
@@ -184,6 +184,8 @@ gpgme_op_trustlist_start (GpgmeCtx ctx, const char *pattern, int max_level)
   if (err)
     goto leave;
 
+  _gpgme_engine_set_status_handler (ctx->engine,
+				    trustlist_status_handler, ctx);
   err = _gpgme_engine_set_colon_line_handler (ctx->engine,
 					      trustlist_colon_handler, ctx);
   if (err)