GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-11-26 Marcus Brinkmann <marcus@g10code.de>

Browse Source 
* opassuan.c (opassuan_start): Allocate result structure before
	beginning operation.
This commit is contained in:
Marcus Brinkmann 2009-11-26 17:53:06 +00:00
parent ef640ca8ef
commit 56af8b77e6
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2009-11-26 Marcus Brinkmann <marcus@g10code.de>
* opassuan.c (opassuan_start): Allocate result structure before
beginning operation.
2009-11-25 Marcus Brinkmann <marcus@g10code.de> 2009-11-25 Marcus Brinkmann <marcus@g10code.de>
* gpgme-tool.c (gpgme_server): Use assuan_fd_t and assuan_fdopen * gpgme-tool.c (gpgme_server): Use assuan_fd_t and assuan_fdopen

24
src/opassuan.c
View File

@ -29,6 +29,14 @@
#include "util.h" #include "util.h"
#include "debug.h" #include "debug.h"
/* LEGACY: Remove this when removing the deprecated result
structure. */
typedef struct
{
struct _gpgme_op_assuan_result result;
} *op_data_t;
static gpgme_error_t static gpgme_error_t
opassuan_start (gpgme_ctx_t ctx, int synchronous, opassuan_start (gpgme_ctx_t ctx, int synchronous,
const char *command, const char *command,
@ -50,6 +58,17 @@ opassuan_start (gpgme_ctx_t ctx, int synchronous,
if (err) if (err)
return err; return err;
{
/* LEGACY: Remove this when removing the deprecated result
structure. */
void *hook;
op_data_t opd;
err = _gpgme_op_data_lookup (ctx, OPDATA_ASSUAN, &hook,
sizeof (*opd), NULL);
if (err)
return err;
}
return _gpgme_engine_op_assuan_transact (ctx->engine, command, return _gpgme_engine_op_assuan_transact (ctx->engine, command,
data_cb, data_cb_value, data_cb, data_cb_value,
inq_cb, inq_cb_value, inq_cb, inq_cb_value,
@ -138,11 +157,6 @@ struct engine
void *engine; void *engine;
}; };
typedef struct
{
struct _gpgme_op_assuan_result result;
} *op_data_t;
gpg_error_t _gpgme_engine_assuan_last_op_err (void *engine); gpg_error_t _gpgme_engine_assuan_last_op_err (void *engine);
gpgme_assuan_result_t gpgme_assuan_result_t