diff options
| author | Marcus Brinkmann <[email protected]> | 2010-04-19 16:59:23 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2010-04-19 16:59:23 +0000 |
| commit | dfefe1b390bb5d15d7ef3e0564378a8139d2d335 (patch) | |
| tree | e66ebe6016574d274ad441e95f8669f6a62152de /src/engine-g13.c | |
| parent | More robust detection of handle and sockets (diff) | |
| download | gpgme-dfefe1b390bb5d15d7ef3e0564378a8139d2d335.tar.gz gpgme-dfefe1b390bb5d15d7ef3e0564378a8139d2d335.zip | |
2010-04-19 Marcus Brinkmann <[email protected]>
* assuan-support.c (my_spawn): Cast to avoid warning.
* engine-g13.c (g13_new): Make ARGV array of pointer to const
char.
(g13_assuan_simple_command) [!USE_DESCRIPTOR_FUNCTION]: Don't define.
* ops.h (_gpgme_key_append_name): Same in prototype.
* key.c (_gpgme_key_append_name): Make SRC argument pointer to
const char.
* posix-util.c (_gpgme_get_uiserver_socket_path): Make HOMEDIR
const.
* vfs-mount.c (gpgme_op_vfs_transact_start): Never define this
potentially useful but currently unused function.
* vfs-create.c (gpgme_op_vfs_transact_start): Likewise.
Diffstat (limited to 'src/engine-g13.c')
| -rw-r--r-- | src/engine-g13.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/engine-g13.c b/src/engine-g13.c index 7ccca92c..07cfe7fa 100644 --- a/src/engine-g13.c +++ b/src/engine-g13.c @@ -211,7 +211,7 @@ g13_new (void **engine, const char *file_name, const char *home_dir) gpgme_error_t err = 0; engine_g13_t g13; int argc; - char *argv[5]; + const char *argv[5]; char *dft_display = NULL; char dft_ttyname[64]; char *dft_ttytype = NULL; @@ -392,6 +392,7 @@ g13_set_locale (void *engine, int category, const char *value) } +#if USE_DESCRIPTOR_PASSING static gpgme_error_t g13_assuan_simple_command (assuan_context_t ctx, char *cmd, engine_status_handler_t status_fnc, @@ -442,6 +443,7 @@ g13_assuan_simple_command (assuan_context_t ctx, char *cmd, return err; } +#endif static gpgme_error_t |