[git] Assuan - branch, master, updated. libassuan-2.0.1-29-g8660e89
by Werner Koch
cvs at cvs.gnupg.org
Mon Feb 28 09:54:32 CET 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPC library used by GnuPG".
The branch, master has been updated
via 8660e89916d7e0d0df59939affd07c6ed78a7313 (commit)
via 65078fa2e4b3a4404c8eec012783aaeb7925c685 (commit)
from 1a5532257ff92c76e6fea407496b5f95356fc061 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8660e89916d7e0d0df59939affd07c6ed78a7313
Author: Werner Koch <wk at gnupg.org>
Date: Mon Feb 28 09:29:57 2011 +0100
Simplify libassuan.vers
diff --git a/src/ChangeLog b/src/ChangeLog
index fbb3797..a12b9cb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-28 Werner Koch <wk at g10code.com>
+
+ * libassuan.vers: Fold LIBASSUAN_1.1 block into LIBASSUAN_1.0.
+
2011-02-28 Ben Kibbey <bjk at luxsci.net>
* assuan-handler.c (assuan_register_pre_cmd_notify): Pass command
diff --git a/src/libassuan.vers b/src/libassuan.vers
index 261e0e7..6311ff1 100644
--- a/src/libassuan.vers
+++ b/src/libassuan.vers
@@ -20,13 +20,6 @@
# Please remember to add new functions also to libassuan.def
#-----------------------------------------------------------
-LIBASSUAN_1.1 {
- global:
- __assuan_socket;
- __assuan_connect;
- assuan_register_pre_cmd_notify;
-};
-
LIBASSUAN_1.0 {
global:
assuan_accept;
@@ -72,6 +65,7 @@ LIBASSUAN_1.0 {
assuan_register_input_notify;
assuan_register_option_handler;
assuan_register_output_notify;
+ assuan_register_pre_cmd_notify;
assuan_register_post_cmd_notify;
assuan_register_reset_notify;
assuan_release;
@@ -111,6 +105,8 @@ LIBASSUAN_1.0 {
__assuan_socketpair;
__assuan_spawn;
__assuan_usleep;
+ __assuan_socket;
+ __assuan_connect;
local:
*;
commit 65078fa2e4b3a4404c8eec012783aaeb7925c685
Author: Ben Kibbey <bjk at luxsci.net>
Date: Thu Feb 24 20:54:04 2011 -0500
Pass only the command name to the pre_cmd_notify() callback to keep ABI compatibility.
diff --git a/src/ChangeLog b/src/ChangeLog
index c34af0c..fbb3797 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-28 Ben Kibbey <bjk at luxsci.net>
+
+ * assuan-handler.c (assuan_register_pre_cmd_notify): Pass command
+ string as second argument.
+ * assuan.h (assuan_command_t): Move back to assuan-defs.h.
+
2011-02-24 Ben Kibbey <bjk at luxsci.net>
* assuan-handler.c (assuan_register_pre_cmd_notify): New callback.
diff --git a/src/assuan-defs.h b/src/assuan-defs.h
index da2a9d7..8a3fcc2 100644
--- a/src/assuan-defs.h
+++ b/src/assuan-defs.h
@@ -58,6 +58,14 @@
#define _assuan_error(ctx, errcode) gpg_err_make ((ctx)->err_source, errcode)
+struct cmdtbl_s
+{
+ const char *name;
+ assuan_handler_t handler;
+ const char *helpstr;
+};
+
+
/* The context we use with most functions. */
struct assuan_context_s
@@ -188,7 +196,7 @@ struct assuan_context_s
gpg_error_t (*accept_handler)(assuan_context_t);
void (*finish_handler)(assuan_context_t);
- assuan_command_t cmdtbl;
+ struct cmdtbl_s *cmdtbl;
size_t cmdtbl_used; /* used entries */
size_t cmdtbl_size; /* allocated size of table */
@@ -205,7 +213,7 @@ struct assuan_context_s
assuan_handler_t output_notify_fnc;
/* This function is called right before a command handler is called. */
- gpg_error_t (*pre_cmd_notify_fnc)(assuan_context_t, assuan_command_t);
+ gpg_error_t (*pre_cmd_notify_fnc)(assuan_context_t, const char *cmd);
/* This function is called right after a command has been processed.
It may be used to command related cleanup. */
diff --git a/src/assuan-handler.c b/src/assuan-handler.c
index 5016fcb..cb271fa 100644
--- a/src/assuan-handler.c
+++ b/src/assuan-handler.c
@@ -400,7 +400,7 @@ assuan_register_command (assuan_context_t ctx, const char *cmd_name,
}
else if (ctx->cmdtbl_used >= ctx->cmdtbl_size)
{
- struct _assuan_command_s *x;
+ struct cmdtbl_s *x;
x = _assuan_realloc (ctx, ctx->cmdtbl, (ctx->cmdtbl_size+10) * sizeof *x);
if (!x)
@@ -429,7 +429,7 @@ assuan_get_command_name (assuan_context_t ctx)
gpg_error_t
assuan_register_pre_cmd_notify (assuan_context_t ctx,
gpg_error_t (*fnc)(assuan_context_t,
- assuan_command_t))
+ const char *cmd))
{
if (!ctx)
return _assuan_error (ctx, GPG_ERR_ASS_INV_VALUE);
@@ -602,7 +602,7 @@ dispatch_command (assuan_context_t ctx, char *line, int linelen)
linelen -= shift;
if (ctx->pre_cmd_notify_fnc) {
- err = ctx->pre_cmd_notify_fnc(ctx, &ctx->cmdtbl[i]);
+ err = ctx->pre_cmd_notify_fnc(ctx, ctx->cmdtbl[i].name);
if (err)
return PROCESS_DONE(ctx, err);
diff --git a/src/assuan.h.in b/src/assuan.h.in
index 630aefd..426fc4c 100644
--- a/src/assuan.h.in
+++ b/src/assuan.h.in
@@ -273,22 +273,13 @@ void assuan_set_log_stream (assuan_context_t ctx, FILE *fp);
typedef gpg_error_t (*assuan_handler_t) (assuan_context_t, char *);
-struct _assuan_command_s
-{
- const char *name;
- assuan_handler_t handler;
- const char *helpstr;
-};
-
-typedef struct _assuan_command_s *assuan_command_t;
-
/*-- assuan-handler.c --*/
gpg_error_t assuan_register_command (assuan_context_t ctx,
const char *cmd_string,
assuan_handler_t handler,
const char *help_string);
gpg_error_t assuan_register_pre_cmd_notify (assuan_context_t ctx,
- gpg_error_t (*fnc)(assuan_context_t, assuan_command_t));
+ gpg_error_t (*fnc)(assuan_context_t, const char *cmd));
gpg_error_t assuan_register_post_cmd_notify (assuan_context_t ctx,
void (*fnc)(assuan_context_t,
gpg_error_t));
-----------------------------------------------------------------------
Summary of changes:
src/ChangeLog | 10 ++++++++++
src/assuan-defs.h | 12 ++++++++++--
src/assuan-handler.c | 6 +++---
src/assuan.h.in | 11 +----------
src/libassuan.vers | 10 +++-------
5 files changed, 27 insertions(+), 22 deletions(-)
hooks/post-receive
--
IPC library used by GnuPG
http://git.gnupg.org
More information about the Gnupg-commits
mailing list