[v4,1/4] iconv: Always encode "optional direct" UTF-7 characters
Checks
Context |
Check |
Description |
dj/TryBot-apply_patch |
success
|
Patch applied to master at the time it was sent
|
Commit Message
Signed-off-by: Max Gautier <mg@max.gautier.name>
---
iconvdata/utf-7.c | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
Comments
On 09/12/2021 06:31, Max Gautier via Libc-alpha wrote:
> Signed-off-by: Max Gautier <mg@max.gautier.name>
LGTM, thanks.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
> ---
> iconvdata/utf-7.c | 12 ++----------
> 1 file changed, 2 insertions(+), 10 deletions(-)
>
> diff --git a/iconvdata/utf-7.c b/iconvdata/utf-7.c
> index 0ed46c948d..9ba0974959 100644
> --- a/iconvdata/utf-7.c
> +++ b/iconvdata/utf-7.c
> @@ -29,14 +29,6 @@
> #include <stdlib.h>
>
>
> -/* Define this to 1 if you want the so-called "optional direct" characters
> - ! " # $ % & * ; < = > @ [ ] ^ _ ` { | }
> - to be encoded. Define to 0 if you want them to be passed straight
> - through, like the so-called "direct" characters.
> - We set this to 1 because it's safer.
> - */
> -#define UTF7_ENCODE_OPTIONAL_CHARS 1
> -
>
> /* The set of "direct characters":
> A-Z a-z 0-9 ' ( ) , - . / : ? space tab lf cr
> @@ -323,7 +315,7 @@ base64 (unsigned int i)
> if ((statep->__count & 0x18) == 0) \
> { \
> /* base64 encoding inactive */ \
> - if (UTF7_ENCODE_OPTIONAL_CHARS ? isdirect (ch) : isxdirect (ch)) \
> + if (isdirect (ch)) \
> { \
> *outptr++ = (unsigned char) ch; \
> } \
> @@ -375,7 +367,7 @@ base64 (unsigned int i)
> else \
> { \
> /* base64 encoding active */ \
> - if (UTF7_ENCODE_OPTIONAL_CHARS ? isdirect (ch) : isxdirect (ch)) \
> + if (isdirect (ch)) \
> { \
> /* deactivate base64 encoding */ \
> size_t count; \
@@ -29,14 +29,6 @@
#include <stdlib.h>
-/* Define this to 1 if you want the so-called "optional direct" characters
- ! " # $ % & * ; < = > @ [ ] ^ _ ` { | }
- to be encoded. Define to 0 if you want them to be passed straight
- through, like the so-called "direct" characters.
- We set this to 1 because it's safer.
- */
-#define UTF7_ENCODE_OPTIONAL_CHARS 1
-
/* The set of "direct characters":
A-Z a-z 0-9 ' ( ) , - . / : ? space tab lf cr
@@ -323,7 +315,7 @@ base64 (unsigned int i)
if ((statep->__count & 0x18) == 0) \
{ \
/* base64 encoding inactive */ \
- if (UTF7_ENCODE_OPTIONAL_CHARS ? isdirect (ch) : isxdirect (ch)) \
+ if (isdirect (ch)) \
{ \
*outptr++ = (unsigned char) ch; \
} \
@@ -375,7 +367,7 @@ base64 (unsigned int i)
else \
{ \
/* base64 encoding active */ \
- if (UTF7_ENCODE_OPTIONAL_CHARS ? isdirect (ch) : isxdirect (ch)) \
+ if (isdirect (ch)) \
{ \
/* deactivate base64 encoding */ \
size_t count; \