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

core: Cast away the common const problem with spawn and argv.

Browse Source 
* src/dirinfo.c (read_gpgconf_dirs): Use a cast to assignd to ARGV.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2016-09-13 20:57:15 +02:00
parent 3009e6162e
commit 686a065f63
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dirinfo.c
View File

@ -193,7 +193,7 @@ read_gpgconf_dirs (const char *pgmname, int components)
char *mark = NULL; char *mark = NULL;
argv[0] = (char *)pgmname; argv[0] = (char *)pgmname;
argv[1] = components? "--list-components" : "--list-dirs"; argv[1] = (char*)(components? "--list-components" : "--list-dirs");
argv[2] = NULL; argv[2] = NULL;
if (_gpgme_io_pipe (rp, 1) < 0) if (_gpgme_io_pipe (rp, 1) < 0)

8
src/engine-gpgconf.c
View File

@ -200,7 +200,7 @@ gpgconf_config_release (gpgme_conf_comp_t conf)
allow for quite a long "group" line, which is usually the longest allow for quite a long "group" line, which is usually the longest
line (mine is currently ~3k). */ line (mine is currently ~3k). */
static gpgme_error_t static gpgme_error_t
gpgconf_read (void *engine, char *arg1, char *arg2, gpgconf_read (void *engine, const char *arg1, char *arg2,
gpgme_error_t (*cb) (void *hook, char *line), gpgme_error_t (*cb) (void *hook, char *line),
void *hook) void *hook)
{ {
@ -217,7 +217,7 @@ gpgconf_read (void *engine, char *arg1, char *arg2,
int nread; int nread;
char *mark = NULL; char *mark = NULL;
argv[1] = arg1; argv[1] = (char*)arg1;
argv[2] = arg2; argv[2] = arg2;
@ -678,14 +678,14 @@ _gpgme_conf_opt_change (gpgme_conf_opt_t opt, int reset, gpgme_conf_arg_t arg)
/* FIXME: Major problem: We don't get errors from gpgconf. */ /* FIXME: Major problem: We don't get errors from gpgconf. */
static gpgme_error_t static gpgme_error_t
gpgconf_write (void *engine, char *arg1, char *arg2, gpgme_data_t conf) gpgconf_write (void *engine, const char *arg1, char *arg2, gpgme_data_t conf)
{ {
struct engine_gpgconf *gpgconf = engine; struct engine_gpgconf *gpgconf = engine;
gpgme_error_t err = 0; gpgme_error_t err = 0;
#define BUFLEN 1024 #define BUFLEN 1024
char buf[BUFLEN]; char buf[BUFLEN];
int buflen = 0; int buflen = 0;
char *argv[] = { NULL /* file_name */, arg1, arg2, 0 }; char *argv[] = { NULL /* file_name */, (char*)arg1, arg2, 0 };
int rp[2]; int rp[2];
struct spawn_fd_item_s cfd[] = { {-1, 0 /* STDIN_FILENO */}, {-1, -1} }; struct spawn_fd_item_s cfd[] = { {-1, 0 /* STDIN_FILENO */}, {-1, -1} };
int status; int status;