[PATCH 0/1] MR3223: winspool: Declare JobW as a void pointer in SetJobA.

[Alex Henrie (＠alexhenrie)]

To reduce the number of casts required and avoid a scan-build warning.

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

[PATCH 1/1] winspool: Declare JobW as a void pointer in SetJobA.

[Alex Henrie]

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

To reduce the number of casts required and avoid a scan-build warning.
---
 dlls/winspool.drv/info.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c
index 30df3199f40..b82df25082c 100644
--- a/dlls/winspool.drv/info.c
+++ b/dlls/winspool.drv/info.c
@@ -2979,7 +2979,7 @@ BOOL WINAPI SetJobA(HANDLE hPrinter, DWORD JobId, DWORD Level,
                     LPBYTE pJob, DWORD Command)
 {
     BOOL ret;
-    LPBYTE JobW;
+    void *JobW;
     UNICODE_STRING usBuffer;
 
     TRACE("(%p, %ld, %ld, %p, %ld)\n",hPrinter, JobId, Level, pJob, Command);
@@ -2996,7 +2996,7 @@ BOOL WINAPI SetJobA(HANDLE hPrinter, DWORD JobId, DWORD Level,
         JOB_INFO_1W *info1W = malloc(sizeof(*info1W));
         JOB_INFO_1A *info1A = (JOB_INFO_1A*)pJob;
 
-        JobW = (LPBYTE)info1W;
+        JobW = info1W;
         info1W->pUserName = asciitounicode(&usBuffer, info1A->pUserName);
         info1W->pDocument = asciitounicode(&usBuffer, info1A->pDocument);
         info1W->pDatatype = asciitounicode(&usBuffer, info1A->pDatatype);
@@ -3012,7 +3012,7 @@ BOOL WINAPI SetJobA(HANDLE hPrinter, DWORD JobId, DWORD Level,
         JOB_INFO_2W *info2W = malloc(sizeof(*info2W));
         JOB_INFO_2A *info2A = (JOB_INFO_2A*)pJob;
 
-        JobW = (LPBYTE)info2W;
+        JobW = info2W;
         info2W->pUserName = asciitounicode(&usBuffer, info2A->pUserName);
         info2W->pDocument = asciitounicode(&usBuffer, info2A->pDocument);
         info2W->pNotifyName = asciitounicode(&usBuffer, info2A->pNotifyName);
@@ -3045,7 +3045,7 @@ BOOL WINAPI SetJobA(HANDLE hPrinter, DWORD JobId, DWORD Level,
     {
     case 1:
       {
-        JOB_INFO_1W *info1W = (JOB_INFO_1W*)JobW;
+        JOB_INFO_1W *info1W = JobW;
         free(info1W->pUserName);
         free(info1W->pDocument);
         free(info1W->pDatatype);
@@ -3054,7 +3054,7 @@ BOOL WINAPI SetJobA(HANDLE hPrinter, DWORD JobId, DWORD Level,
       }
     case 2:
       {
-        JOB_INFO_2W *info2W = (JOB_INFO_2W*)JobW;
+        JOB_INFO_2W *info2W = JobW;
         free(info2W->pUserName);
         free(info2W->pDocument);
         free(info2W->pNotifyName);
-- 
GitLab

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

[PATCH 0/1] MR3223: winspool: Declare JobW as a void pointer in SetJobA. - approved

[Huw Davies (＠huw)]

This merge request was approved by Huw Davies.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3223