diff options
| author | Werner Koch <[email protected]> | 2005-08-09 13:19:24 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2005-08-09 13:19:24 +0000 |
| commit | b71096a83217e1c8a9163a955a74a4b88afa4290 (patch) | |
| tree | 1bd3c3a7864645eee6c628bea03a5dea9659201d /assuan/assuan-client.c | |
| parent | doc/ (diff) | |
| download | gpgme-b71096a83217e1c8a9163a955a74a4b88afa4290.tar.gz gpgme-b71096a83217e1c8a9163a955a74a4b88afa4290.zip | |
Merged changes from upstream libassuan to allow building a W32 DLL.
Diffstat (limited to 'assuan/assuan-client.c')
| -rw-r--r-- | assuan/assuan-client.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/assuan/assuan-client.c b/assuan/assuan-client.c index d5c0ec81..a2189946 100644 --- a/assuan/assuan-client.c +++ b/assuan/assuan-client.c @@ -32,12 +32,12 @@ #define xtoi_2(p) ((xtoi_1(p) * 16) + xtoi_1((p)+1)) -AssuanError +assuan_error_t _assuan_read_from_server (ASSUAN_CONTEXT ctx, int *okay, int *off) { char *line; int linelen; - AssuanError rc; + assuan_error_t rc; *okay = 0; *off = 0; @@ -126,14 +126,14 @@ _assuan_read_from_server (ASSUAN_CONTEXT ctx, int *okay, int *off) * the one one returned by the server in error lines or from the * callback functions. **/ -AssuanError +assuan_error_t assuan_transact (ASSUAN_CONTEXT ctx, const char *command, - AssuanError (*data_cb)(void *, const void *, size_t), + assuan_error_t (*data_cb)(void *, const void *, size_t), void *data_cb_arg, - AssuanError (*inquire_cb)(void*, const char *), + assuan_error_t (*inquire_cb)(void*, const char *), void *inquire_cb_arg, - AssuanError (*status_cb)(void*, const char *), + assuan_error_t (*status_cb)(void*, const char *), void *status_cb_arg) { int rc, okay, off; @@ -144,6 +144,9 @@ assuan_transact (ASSUAN_CONTEXT ctx, if (rc) return rc; + if (*command == '#' || !*command) + return 0; /* Don't expect a response for a comment line. */ + again: rc = _assuan_read_from_server (ctx, &okay, &off); if (rc) |