aboutsummaryrefslogtreecommitdiffstats
path: root/g10/decrypt-data.c
diff options
context:
space:
mode:
authorNIIBE Yutaka <[email protected]>2016-01-12 01:32:20 +0000
committerNIIBE Yutaka <[email protected]>2016-01-12 01:32:20 +0000
commit3f52c7da3940ec06572270d511000dc7fe9c27d2 (patch)
treeef43ad8f5c7f9a1eee402f5444f71114d83ccaae /g10/decrypt-data.c
parentgpg: Move documentation from keydb.h to keydb.c and getkey.c. (diff)
downloadgnupg-3f52c7da3940ec06572270d511000dc7fe9c27d2.tar.gz
gnupg-3f52c7da3940ec06572270d511000dc7fe9c27d2.zip
common: Fix iobuf API of filter function for alignment.
* common/iobuf.h (IOBUFCTRL_DESC): Change the call semantics. * common/iobuf.c (iobuf_desc): Add the second argument DESC. (print_chain, iobuf_close, do_open, iobuf_sockopen, iobuf_ioctl) (iobuf_push_filter2, pop_filter, iobuf_write_temp): Change calls of iobuf_desc. (file_filter, file_es_filter, sock_filter, block_filter): Fill the description. * common/t-iobuf.c (every_other_filter, double_filter): Likewise. * g10/armor.c, g10/cipher.c, g10/compress-bz2.c, g10/compress.c, g10/decrypt-data.c, g10/encrypt.c, g10/mdfilter.c, g10/progress.c, g10/textfilter.c: Likewise. -- Newer GCC warns against possible alignment difference of pointers. This change can silence those warnings. Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'g10/decrypt-data.c')
-rw-r--r--g10/decrypt-data.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/decrypt-data.c b/g10/decrypt-data.c
index 2d9f54f31..1380fafdc 100644
--- a/g10/decrypt-data.c
+++ b/g10/decrypt-data.c
@@ -425,7 +425,7 @@ mdc_decode_filter (void *opaque, int control, IOBUF a,
}
else if ( control == IOBUFCTRL_DESC )
{
- *(char**)buf = "mdc_decode_filter";
+ mem2str (buf, "mdc_decode_filter", *ret_len);
}
return rc;
}
@@ -496,7 +496,7 @@ decode_filter( void *opaque, int control, IOBUF a, byte *buf, size_t *ret_len)
}
else if ( control == IOBUFCTRL_DESC )
{
- *(char**)buf = "decode_filter";
+ mem2str (buf, "decode_filter", *ret_len);
}
return rc;
}