aboutsummaryrefslogtreecommitdiffstats
path: root/g10
diff options
context:
space:
mode:
Diffstat (limited to 'g10')
-rw-r--r--g10/armor.c2
-rw-r--r--g10/cipher.c2
-rw-r--r--g10/compress-bz2.c2
-rw-r--r--g10/compress.c2
-rw-r--r--g10/encode.c2
-rw-r--r--g10/encr-data.c4
-rw-r--r--g10/mdfilter.c2
-rw-r--r--g10/pipemode.c2
-rw-r--r--g10/progress.c2
-rw-r--r--g10/textfilter.c2
10 files changed, 11 insertions, 11 deletions
diff --git a/g10/armor.c b/g10/armor.c
index be03692f1..1ae3c6062 100644
--- a/g10/armor.c
+++ b/g10/armor.c
@@ -1300,7 +1300,7 @@ armor_filter( void *opaque, int control,
release_armor_context (afx);
}
else if( control == IOBUFCTRL_DESC )
- *(char**)buf = "armor_filter";
+ mem2str (buf, "armor_filter", *ret_len);
return rc;
}
diff --git a/g10/cipher.c b/g10/cipher.c
index 0c51100cc..45e1963f5 100644
--- a/g10/cipher.c
+++ b/g10/cipher.c
@@ -145,7 +145,7 @@ cipher_filter( void *opaque, int control,
cipher_close(cfx->cipher_hd);
}
else if( control == IOBUFCTRL_DESC ) {
- *(char**)buf = "cipher_filter";
+ mem2str (buf, "cipher_filter", *ret_len);
}
return rc;
}
diff --git a/g10/compress-bz2.c b/g10/compress-bz2.c
index baef92f3f..6c5bd66b3 100644
--- a/g10/compress-bz2.c
+++ b/g10/compress-bz2.c
@@ -247,6 +247,6 @@ compress_filter_bz2( void *opaque, int control,
zfx->release (zfx);
}
else if( control == IOBUFCTRL_DESC )
- *(char**)buf = "compress_filter";
+ mem2str (buf, "compress_filter", *ret_len);
return rc;
}
diff --git a/g10/compress.c b/g10/compress.c
index 07c9e5e9c..4598affff 100644
--- a/g10/compress.c
+++ b/g10/compress.c
@@ -295,7 +295,7 @@ compress_filter( void *opaque, int control,
zfx->release (zfx);
}
else if( control == IOBUFCTRL_DESC )
- *(char**)buf = "compress_filter";
+ mem2str (buf, "compress_filter", *ret_len);
return rc;
}
diff --git a/g10/encode.c b/g10/encode.c
index a579c428d..93c70a70d 100644
--- a/g10/encode.c
+++ b/g10/encode.c
@@ -736,7 +736,7 @@ encrypt_filter( void *opaque, int control,
xfree(efx->symkey_s2k);
}
else if( control == IOBUFCTRL_DESC ) {
- *(char**)buf = "encrypt_filter";
+ mem2str (buf, "encrypt_filter", *ret_len);
}
return rc;
}
diff --git a/g10/encr-data.c b/g10/encr-data.c
index c65aa11b5..baa0606fe 100644
--- a/g10/encr-data.c
+++ b/g10/encr-data.c
@@ -300,7 +300,7 @@ mdc_decode_filter( void *opaque, int control, IOBUF a,
release_dfx_context (dfx);
}
else if( control == IOBUFCTRL_DESC ) {
- *(char**)buf = "mdc_decode_filter";
+ mem2str (buf, "mdc_decode_filter", *ret_len);
}
return rc;
}
@@ -329,7 +329,7 @@ decode_filter( void *opaque, int control, IOBUF a, byte *buf, size_t *ret_len)
release_dfx_context (fc);
}
else if( control == IOBUFCTRL_DESC ) {
- *(char**)buf = "decode_filter";
+ mem2str (buf, "decode_filter", *ret_len);
}
return rc;
}
diff --git a/g10/mdfilter.c b/g10/mdfilter.c
index 9c0059e05..bb47f98cd 100644
--- a/g10/mdfilter.c
+++ b/g10/mdfilter.c
@@ -58,7 +58,7 @@ md_filter( void *opaque, int control,
*ret_len = i;
}
else if( control == IOBUFCTRL_DESC )
- *(char**)buf = "md_filter";
+ mem2str (buf, "md_filter", *ret_len);
return rc;
}
diff --git a/g10/pipemode.c b/g10/pipemode.c
index 077f967cd..60c802060 100644
--- a/g10/pipemode.c
+++ b/g10/pipemode.c
@@ -281,7 +281,7 @@ pipemode_filter( void *opaque, int control,
*ret_len = n;
}
else if( control == IOBUFCTRL_DESC )
- *(char**)buf = "pipemode_filter";
+ mem2str (buf, "pipemode_filter", *ret_len);
return rc;
}
diff --git a/g10/progress.c b/g10/progress.c
index 8c8265f36..cea080c0e 100644
--- a/g10/progress.c
+++ b/g10/progress.c
@@ -91,7 +91,7 @@ progress_filter (void *opaque, int control,
pfx->what = NULL;
}
else if (control == IOBUFCTRL_DESC)
- *(char**)buf = "progress_filter";
+ mem2str (buf, "progress_filter", *ret_len);
return rc;
}
diff --git a/g10/textfilter.c b/g10/textfilter.c
index dc72a56fc..79f2f67dc 100644
--- a/g10/textfilter.c
+++ b/g10/textfilter.c
@@ -150,7 +150,7 @@ text_filter( void *opaque, int control,
tfx->buffer = NULL;
}
else if( control == IOBUFCTRL_DESC )
- *(char**)buf = "text_filter";
+ mem2str (buf, "text_filter", *ret_len);
return rc;
}