aboutsummaryrefslogtreecommitdiffstats
path: root/scd
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--scd/ChangeLog5
-rw-r--r--scd/command.c9
2 files changed, 11 insertions, 3 deletions
diff --git a/scd/ChangeLog b/scd/ChangeLog
index 9a545d87f..db19feece 100644
--- a/scd/ChangeLog
+++ b/scd/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-02 Marcus Brinkmann <[email protected]>
+
+ * command.c (reset_notify): Take LINE arg and return error.
+ (register_commands): Use assuan_handler_t type.
+
2009-10-25 Werner Koch <[email protected]>
* scdaemon.c (scd_deinit_default_ctrl): Release IN_DATA.
diff --git a/scd/command.c b/scd/command.c
index b70455eec..f12f11acf 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -338,12 +338,15 @@ do_reset (ctrl_t ctrl, int send_reset)
}
-static void
-reset_notify (assuan_context_t ctx)
+static gpg_error_t
+reset_notify (assuan_context_t ctx, char *line)
{
ctrl_t ctrl = assuan_get_pointer (ctx);
+ (void) line;
+
do_reset (ctrl, 1);
+ return 0;
}
@@ -1843,7 +1846,7 @@ register_commands (assuan_context_t ctx)
{
static struct {
const char *name;
- gpg_error_t (*handler)(assuan_context_t, char *line);
+ assuan_handler_t handler;
} table[] = {
{ "SERIALNO", cmd_serialno },
{ "LEARN", cmd_learn },