[PATCH v1] msvc: fix non-standard escape sequence in source

Subsystems: the rest

STALE2929d

4 messages, 3 authors, 2018-07-25 · open the first message on its own page

[PATCH v1] msvc: fix non-standard escape sequence in source

From: <hidden>
Date: 2018-07-24 14:43:07

From: Jeff Hostetler <redacted>

Replace non-standard "\e" escape sequence with "\x1B".

In commit 7a17918c34f4e83982456ffe22d880c3cda5384f a trace message with
several "\e" escape sequences was added.  This causes a compiler warning
under MSVC.

According to [1], the "\e" sequence is an extension supported by GCC,
clang, and tcc.

[1] https://en.wikipedia.org/wiki/Escape_sequences_in_C

Signed-off-by: Jeff Hostetler <redacted>
---
 convert.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/convert.c b/convert.c
index 56cfe31..52092be 100644
--- a/convert.c
+++ b/convert.c
@@ -335,7 +335,7 @@ static void trace_encoding(const char *context, const char *path,
 	strbuf_addf(&trace, "%s (%s, considered %s):\n", context, path, encoding);
 	for (i = 0; i < len && buf; ++i) {
 		strbuf_addf(
-			&trace,"| \e[2m%2i:\e[0m %2x \e[2m%c\e[0m%c",
+			&trace,"| \x1B[2m%2i:\x1B[0m %2x \x1B[2m%c\x1B[0m%c",
 			i,
 			(unsigned char) buf[i],
 			(buf[i] > 32 && buf[i] < 127 ? buf[i] : ' '),
-- 
2.9.3

Re: [PATCH v1] msvc: fix non-standard escape sequence in source

From: Eric Sunshine <hidden>
Date: 2018-07-24 17:33:26

On Tue, Jul 24, 2018 at 10:43 AM [off-list ref] wrote:
Replace non-standard "\e" escape sequence with "\x1B".

In commit 7a17918c34f4e83982456ffe22d880c3cda5384f a trace message with
several "\e" escape sequences was added.  This causes a compiler warning
under MSVC.
Wrong commit. That code was actually introduced by 541d059cd9
(convert: add tracing for 'working-tree-encoding' attribute,
2018-04-15).
quoted hunk
diff --git a/convert.c b/convert.c
@@ -335,7 +335,7 @@ static void trace_encoding(const char *context, const char *path,
        strbuf_addf(&trace, "%s (%s, considered %s):\n", context, path, encoding);
        for (i = 0; i < len && buf; ++i) {
                strbuf_addf(
-                       &trace,"| \e[2m%2i:\e[0m %2x \e[2m%c\e[0m%c",
+                       &trace,"| \x1B[2m%2i:\x1B[0m %2x \x1B[2m%c\x1B[0m%c",
In this codebase, ESC is always spelled as octal \033 rather than hex \x1b.

Re: [PATCH v1] msvc: fix non-standard escape sequence in source

From: Beat Bolli <hidden>
Date: 2018-07-24 18:13:13

Hi Jeff

On 24.07.18 16:42, git@jeffhostetler.com wrote:
From: Jeff Hostetler <redacted>

Replace non-standard "\e" escape sequence with "\x1B".
This was already fixed in [off-list ref].

Cheers,
Beat

quoted hunk
In commit 7a17918c34f4e83982456ffe22d880c3cda5384f a trace message with
several "\e" escape sequences was added.  This causes a compiler warning
under MSVC.

According to [1], the "\e" sequence is an extension supported by GCC,
clang, and tcc.

[1] https://en.wikipedia.org/wiki/Escape_sequences_in_C

Signed-off-by: Jeff Hostetler <redacted>
---
 convert.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/convert.c b/convert.c
index 56cfe31..52092be 100644
--- a/convert.c
+++ b/convert.c
@@ -335,7 +335,7 @@ static void trace_encoding(const char *context, const char *path,
 	strbuf_addf(&trace, "%s (%s, considered %s):\n", context, path, encoding);
 	for (i = 0; i < len && buf; ++i) {
 		strbuf_addf(
-			&trace,"| \e[2m%2i:\e[0m %2x \e[2m%c\e[0m%c",
+			&trace,"| \x1B[2m%2i:\x1B[0m %2x \x1B[2m%c\x1B[0m%c",
 			i,
 			(unsigned char) buf[i],
 			(buf[i] > 32 && buf[i] < 127 ? buf[i] : ' '),

Re: [PATCH v1] msvc: fix non-standard escape sequence in source

From: Jeff Hostetler <hidden>
Date: 2018-07-25 12:30:45


On 7/24/2018 2:13 PM, Beat Bolli wrote:
Hi Jeff

On 24.07.18 16:42, git@jeffhostetler.com wrote:
quoted
From: Jeff Hostetler <redacted>

Replace non-standard "\e" escape sequence with "\x1B".
This was already fixed in [off-list ref].

Cheers,
Beat
Thanks for the pointer.  I see that commit is in 'next'.
I was only looking in 'master'.

Thanks,
Jeff
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help