winspool: Remove dead code (Clang)
André Hentschel
nerv at dawncrow.de
Tue Dec 22 15:00:33 CST 2015
Signed-off-by: André Hentschel <nerv at dawncrow.de>
---
dlls/winspool.drv/info.c | 46 ++++++++++++++--------------------------------
1 file changed, 14 insertions(+), 32 deletions(-)
diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c
index 04def86..e5f9c73 100644
--- a/dlls/winspool.drv/info.c
+++ b/dlls/winspool.drv/info.c
@@ -4092,8 +4092,6 @@ static BOOL WINSPOOL_GetPrinter_1(HKEY hkeyPrinter, PRINTER_INFO_1W *pi1,
if(WINSPOOL_GetStringFromReg(hkeyPrinter, DescriptionW, ptr, left, &size)) {
if(space && size <= left) {
pi1->pComment = (LPWSTR)ptr;
- ptr += size;
- left -= size;
} else
space = FALSE;
*pcbNeeded += size;
@@ -4224,8 +4222,6 @@ static BOOL WINSPOOL_GetPrinter_2(HKEY hkeyPrinter, PRINTER_INFO_2W *pi2,
if(WINSPOOL_GetStringFromReg(hkeyPrinter, ParametersW, ptr, left, &size)) {
if(space && size <= left) {
pi2->pParameters = (LPWSTR)ptr;
- ptr += size;
- left -= size;
} else
space = FALSE;
*pcbNeeded += size;
@@ -4254,18 +4250,15 @@ static BOOL WINSPOOL_GetPrinter_4(HKEY hkeyPrinter, PRINTER_INFO_4W *pi4,
{
DWORD size, left = cbBuf;
BOOL space = (cbBuf > 0);
- LPBYTE ptr = buf;
*pcbNeeded = 0;
- if(WINSPOOL_GetStringFromReg(hkeyPrinter, NameW, ptr, left, &size)) {
- if(space && size <= left) {
- pi4->pPrinterName = (LPWSTR)ptr;
- ptr += size;
- left -= size;
- } else
- space = FALSE;
- *pcbNeeded += size;
+ if (WINSPOOL_GetStringFromReg(hkeyPrinter, NameW, buf, left, &size)) {
+ if (space && size <= left)
+ pi4->pPrinterName = (LPWSTR)buf;
+ else
+ space = FALSE;
+ *pcbNeeded += size;
}
if(pi4) {
pi4->Attributes = get_dword_from_reg( hkeyPrinter, AttributesW );
@@ -4301,11 +4294,9 @@ static BOOL WINSPOOL_GetPrinter_5(HKEY hkeyPrinter, PRINTER_INFO_5W *pi5,
*pcbNeeded += size;
}
if(WINSPOOL_GetStringFromReg(hkeyPrinter, PortW, ptr, left, &size)) {
- if(space && size <= left) {
- pi5->pPortName = (LPWSTR)ptr;
- ptr += size;
- left -= size;
- } else
+ if (space && size <= left)
+ pi5->pPortName = (LPWSTR)ptr;
+ else
space = FALSE;
*pcbNeeded += size;
}
@@ -4331,20 +4322,17 @@ static BOOL WINSPOOL_GetPrinter_7(HKEY hkeyPrinter, PRINTER_INFO_7W *pi7, LPBYTE
{
DWORD size, left = cbBuf;
BOOL space = (cbBuf > 0);
- LPBYTE ptr = buf;
*pcbNeeded = 0;
- if (! WINSPOOL_GetStringFromReg(hkeyPrinter, ObjectGUIDW, ptr, left, &size))
+ if (! WINSPOOL_GetStringFromReg(hkeyPrinter, ObjectGUIDW, buf, left, &size))
{
- ptr = NULL;
+ buf = NULL;
size = sizeof(pi7->pszObjectGUID);
}
- if (space && size <= left) {
- pi7->pszObjectGUID = (LPWSTR)ptr;
- ptr += size;
- left -= size;
- } else
+ if (space && size <= left)
+ pi7->pszObjectGUID = (LPWSTR)buf;
+ else
space = FALSE;
*pcbNeeded += size;
if (pi7) {
@@ -7836,11 +7824,7 @@ static BOOL get_job_info_1(job_t *job, JOB_INFO_1W *ji1, LPBYTE buf, DWORD cbBuf
{
string_to_buf(job->printer_name, ptr, left, &size, unicode);
if(space && size <= left)
- {
ji1->pPrinterName = (LPWSTR)ptr;
- ptr += size;
- left -= size;
- }
else
space = FALSE;
*pcbNeeded += size;
@@ -7922,8 +7906,6 @@ static BOOL get_job_info_2(job_t *job, JOB_INFO_2W *ji2, LPBYTE buf, DWORD cbBuf
memcpy(ptr, devmode, size-shift);
ji2->pDevMode = (LPDEVMODEW)ptr;
if (!unicode) HeapFree(GetProcessHeap(), 0, dmA);
- ptr += size-shift;
- left -= size;
}
else
space = FALSE;
--
1.9.1
More information about the wine-patches
mailing list