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

2006-11-30 Marcus Brinkmann <marcus@g10code.de>

Browse Source 
* engine-gpgsm.c: Replace AssuanError with gpg_error_t and
	ASSUAN_CONTEXT with assuan_context_t.
This commit is contained in:
Marcus Brinkmann 2006-11-30 20:45:33 +00:00
parent 0bd5dd4b24
commit ca43edcd40
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gpgme/ChangeLog
View File

@ -1,3 +1,8 @@
2006-11-30 Marcus Brinkmann <marcus@g10code.de>
* engine-gpgsm.c: Replace AssuanError with gpg_error_t and
ASSUAN_CONTEXT with assuan_context_t.
2006-11-29 Marcus Brinkmann <marcus@g10code.de> 2006-11-29 Marcus Brinkmann <marcus@g10code.de>
* engine-gpgsm.c (gpgsm_new): Check return value of * engine-gpgsm.c (gpgsm_new): Check return value of

14
gpgme/engine-gpgsm.c
View File

@ -59,7 +59,7 @@ typedef struct
struct engine_gpgsm struct engine_gpgsm
{ {
ASSUAN_CONTEXT assuan_ctx; assuan_context_t assuan_ctx;
iocb_data_t status_cb; iocb_data_t status_cb;
@ -147,7 +147,7 @@ close_notify_handler (int fd, void *opaque)
static gpgme_error_t static gpgme_error_t
map_assuan_error (AssuanError err) map_assuan_error (gpg_error_t err)
{ {
if (!err) if (!err)
return 0; return 0;
@ -573,11 +573,11 @@ gpgsm_new (void **engine, const char *file_name, const char *home_dir,
static gpgme_status_code_t parse_status (const char *name); static gpgme_status_code_t parse_status (const char *name);
static gpgme_error_t static gpgme_error_t
gpgsm_assuan_simple_command (ASSUAN_CONTEXT ctx, char *cmd, gpgsm_assuan_simple_command (assuan_context_t ctx, char *cmd,
engine_status_handler_t status_fnc, engine_status_handler_t status_fnc,
void *status_fnc_value) void *status_fnc_value)
{ {
AssuanError err; gpg_error_t err;
char *line; char *line;
size_t linelen; size_t linelen;
@ -632,7 +632,7 @@ gpgsm_assuan_simple_command (ASSUAN_CONTEXT ctx, char *cmd,
#define COMMANDLINELEN 40 #define COMMANDLINELEN 40
static gpgme_error_t static gpgme_error_t
gpgsm_set_fd (ASSUAN_CONTEXT ctx, const char *which, int fd, const char *opt) gpgsm_set_fd (assuan_context_t ctx, const char *which, int fd, const char *opt)
{ {
char line[COMMANDLINELEN]; char line[COMMANDLINELEN];
@ -689,7 +689,7 @@ parse_status (const char *name)
static gpgme_error_t static gpgme_error_t
status_handler (void *opaque, int fd) status_handler (void *opaque, int fd)
{ {
AssuanError assuan_err; gpg_error_t assuan_err;
gpgme_error_t err = 0; gpgme_error_t err = 0;
engine_gpgsm_t gpgsm = opaque; engine_gpgsm_t gpgsm = opaque;
char *line; char *line;
@ -980,7 +980,7 @@ static gpgme_error_t
set_recipients (engine_gpgsm_t gpgsm, gpgme_key_t recp[]) set_recipients (engine_gpgsm_t gpgsm, gpgme_key_t recp[])
{ {
gpgme_error_t err = 0; gpgme_error_t err = 0;
ASSUAN_CONTEXT ctx = gpgsm->assuan_ctx; assuan_context_t ctx = gpgsm->assuan_ctx;
char *line; char *line;
int linelen; int linelen;
int invalid_recipients = 0; int invalid_recipients = 0;