security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

g10: Fix iobuf API of filter function for alignment.

Browse source 
* include/iobuf.h (struct iobuf_struct): Remove DESC.
* util/iobuf.c (iobuf_desc): New.
(print_chain, iobuf_close, iobuf_open, iobuf_fdopen, iobuf_sockopen)
(iobuf_create, iobuf_append, iobuf_openrw, iobuf_ioctl)
(iobuf_push_filter2, pop_filter, underflow): Use iobuf_desc.
(file_filter, sock_filter, block_filter): Fill the description.
* g10/armor.c, g10/cipher.c, g10/compress-bz2.c, g10/compress.c,
g10/encode.c, g10/encr-data.c, g10/mdfilter.c, g10/pipemode.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 <gniibe@fsij.org>

(backported from 2.1 commit 3f52c7da39)
This commit is contained in:
NIIBE Yutaka 2016-01-26 15:38:27 +09:00
parent a38dffde7b
commit aa4a3aa3e7
12 changed files with 56 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

2
g10/armor.c
View file

@ -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;
}

2
g10/cipher.c
View file

@ -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;
}

2
g10/compress-bz2.c
View file

@ -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;
}

2
g10/compress.c
View file

@ -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;
}

2
g10/encode.c
View file

@ -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;
}

4
g10/encr-data.c
View file

@ -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;
}

2
g10/mdfilter.c
View file

@ -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;
}

2
g10/pipemode.c
View file

@ -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;
}

2
g10/progress.c
View file

@ -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;
}

2
g10/textfilter.c
View file

@ -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;
}