naett.c

commit 8c3a5d92780eacacc24ab34a12cf585997e08ff9
parent 5daf34872adcab1be5a333dae59d18975a885098
Author: Erik Agsjö <erik.agsjo@gmail.com>
Date:   Mon, 31 Jul 2023 16:33:57 +0200

Avoid string type confusion

Diffstat:
M
naett.c
 | 
7
++-----
M
src/naett_win.c
 | 
7
++-----

2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/naett.c b/naett.c
@@ -1247,11 +1247,8 @@ int naettPlatformInitRequest(InternalRequest* req) {
     req->resource = wcsndup(components.lpszUrlPath, components.dwUrlPathLength + components.dwExtraInfoLength);
     free(url);
 
-    LPWSTR uaBuf = NULL;
-    if (req->options.userAgent) {
-        uaBuf = winFromUTF8(req->options.userAgent);
-    }
-    req->session = WinHttpOpen((uaBuf ? uaBuf : _T(NAETT_UA)),
+    LPWSTR uaBuf = winFromUTF8(req->options.userAgent ? req->options.userAgent : NAETT_UA);
+    req->session = WinHttpOpen(uaBuf,
         WINHTTP_ACCESS_TYPE_NO_PROXY,
         WINHTTP_NO_PROXY_NAME,
         WINHTTP_NO_PROXY_BYPASS,
diff --git a/src/naett_win.c b/src/naett_win.c
@@ -231,11 +231,8 @@ int naettPlatformInitRequest(InternalRequest* req) {
     req->resource = wcsndup(components.lpszUrlPath, components.dwUrlPathLength + components.dwExtraInfoLength);
     free(url);
 
-    LPWSTR uaBuf = NULL;
-    if (req->options.userAgent) {
-        uaBuf = winFromUTF8(req->options.userAgent);
-    }
-    req->session = WinHttpOpen((uaBuf ? uaBuf : _T(NAETT_UA)),
+    LPWSTR uaBuf = winFromUTF8(req->options.userAgent ? req->options.userAgent : NAETT_UA);
+    req->session = WinHttpOpen(uaBuf,
         WINHTTP_ACCESS_TYPE_NO_PROXY,
         WINHTTP_NO_PROXY_NAME,
         WINHTTP_NO_PROXY_BYPASS,