[PATCH 0/1] MR1563: mshtml: Remove string constant macros from navigate.c.

[Alex Henrie (＠alexhenrie)]

Having an extra layer of indirection here makes the code less clear.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1563

[PATCH 1/1] mshtml: Remove string constant macros from navigate.c.

[Alex Henrie]

From: Alex Henrie <alexhenrie24(a)gmail.com>

Having an extra layer of indirection here makes the code less clear.
---
 dlls/mshtml/navigate.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c
index ae8ec72fd9d..687a8be6282 100644
--- a/dlls/mshtml/navigate.c
+++ b/dlls/mshtml/navigate.c
@@ -41,10 +41,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
-#define CONTENT_LENGTH "Content-Length"
-#define UTF8_STR "utf-8"
-#define UTF16_STR "utf-16"
-
 struct nsProtocolStream {
     nsIInputStream nsIInputStream_iface;
 
@@ -1152,10 +1148,10 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream)
         if(first_read) {
             switch(This->bsc.bom) {
             case BOM_UTF8:
-                This->nschannel->charset = strdup(UTF8_STR);
+                This->nschannel->charset = strdup("utf-8");
                 break;
             case BOM_UTF16:
-                This->nschannel->charset = strdup(UTF16_STR);
+                This->nschannel->charset = strdup("utf-16");
             case BOM_NONE:
                 /* FIXME: Get charset from HTTP headers */;
             }
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/1563

[PATCH 0/1] MR1563: mshtml: Remove string constant macros from navigate.c. - approved

[Jacek Caban (＠jacek)]

This merge request was approved by Jacek Caban.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1563