diff options
Diffstat (limited to 'sm')
| -rw-r--r-- | sm/ChangeLog | 5 | ||||
| -rw-r--r-- | sm/certdump.c | 9 | ||||
| -rw-r--r-- | sm/certreqgen.c | 2 |
3 files changed, 14 insertions, 2 deletions
diff --git a/sm/ChangeLog b/sm/ChangeLog index 6e445822f..2229a6869 100644 --- a/sm/ChangeLog +++ b/sm/ChangeLog @@ -1,3 +1,8 @@ +2006-11-21 Werner Koch <[email protected]> + + * certdump.c (my_funopen_hook_ret_t): New. + (format_name_writer): Use it for the return value. + 2006-11-14 Werner Koch <[email protected]> * server.c (skip_options): Skip leading spaces. diff --git a/sm/certdump.c b/sm/certdump.c index 032a00ad2..9f398d5ce 100644 --- a/sm/certdump.c +++ b/sm/certdump.c @@ -41,6 +41,13 @@ #include "keydb.h" #include "i18n.h" +#ifdef HAVE_FOPENCOOKIE +typedef ssize_t my_funopen_hook_ret_t; +#else +typedef int my_funopen_hook_ret_t; +#endif + + struct dn_array_s { char *key; char *value; @@ -626,7 +633,7 @@ struct format_name_cookie }; /* The writer function for the memory stream. */ -static int +static my_funopen_hook_ret_t format_name_writer (void *cookie, const char *buffer, size_t size) { struct format_name_cookie *c = cookie; diff --git a/sm/certreqgen.c b/sm/certreqgen.c index f0221d3fd..0fafea1ec 100644 --- a/sm/certreqgen.c +++ b/sm/certreqgen.c @@ -517,7 +517,7 @@ proc_parameters (ctrl_t ctrl, r->lnr, (int)errlen, s+erroff); else log_error (_("line %d: invalid subject name `%s' at pos %d\n"), - r->lnr, s, erroff); + r->lnr, s, (int)erroff); xfree (cardkeyid); return gpg_error (GPG_ERR_INV_PARAMETER); |