Minor cleanups.

3 files changed, 19 insertions, 3 deletions

diff --git a/agent/ChangeLog b/agent/ChangeLog
index caefc5c11..c22797d34 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,13 @@
+2008-11-11  Werner Koch  <[email protected]>
+
+	* call-scd.c (membuf_data_cb): Change return type to
+	assuan_error_t to avoid warnings with newer libassuan versions.
+
+2008-11-04  Werner Koch  <[email protected]>
+
+	* command.c (cmd_killagent): Stop the agent immediately.
+	(start_command_handler): Take care of GPG_ERR_EOF.
+
 2008-10-29  Werner Koch  <[email protected]>
 
 	* gpg-agent.c (main): Move USE_STANDARD_SOCKET to the outer scope.
diff --git a/agent/call-scd.c b/agent/call-scd.c
index 48998da70..c162ad14c 100644
--- a/agent/call-scd.c
+++ b/agent/call-scd.c
@@ -710,7 +710,7 @@ agent_card_serialno (ctrl_t ctrl, char **r_serialno)
 
 
 
-static int
+static assuan_error_t
 membuf_data_cb (void *opaque, const void *buffer, size_t length)
 {
   membuf_t *data = opaque;
diff --git a/agent/command.c b/agent/command.c
index f5787621c..e3e51f4dd 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -1362,8 +1362,11 @@ static int
 cmd_killagent (assuan_context_t ctx, char *line)
 {
   ctrl_t ctrl = assuan_get_pointer (ctx);
+
+  (void)line;
+
   ctrl->server_local->stopme = 1;
-  return 0;
+  return gpg_error (GPG_ERR_EOF);
 }
 
 /* RELOADAGENT
@@ -1373,6 +1376,9 @@ cmd_killagent (assuan_context_t ctx, char *line)
 static int
 cmd_reloadagent (assuan_context_t ctx, char *line)
 {
+  (void)ctx;
+  (void)line;
+
   agent_sighup_action ();
   return 0;
 }
@@ -1666,7 +1672,7 @@ start_command_handler (ctrl_t ctrl, gnupg_fd_t listen_fd, gnupg_fd_t fd)
   for (;;)
     {
       rc = assuan_accept (ctx);
-      if (rc == -1)
+      if (gpg_err_code (rc) == GPG_ERR_EOF || rc == -1)
         {
           break;
         }