i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PrintJob.cpp: use MemoryDeleter.

Browse Source
This commit is contained in:
Jérôme Duval
2013-10-22 18:35:40 +02:00
parent afaeff4cdf
commit 6c1a6532d5
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/PrintJob.cpp
+3 -6
View File
@@ -32,6 +32,7 @@
#include <SystemCatalog.h> #include <SystemCatalog.h>
#include <View.h> #include <View.h>
#include <AutoDeleter.h>
#include <pr_server.h> #include <pr_server.h>
#include <ViewPrivate.h> #include <ViewPrivate.h>
@@ -239,6 +240,7 @@ BPrintJob::BeginJob()
char *printer = _GetCurrentPrinterName(); char *printer = _GetCurrentPrinterName();
if (printer == NULL) if (printer == NULL)
return; return;
MemoryDeleter _(printer);
path.Append(printer); path.Append(printer);
@@ -246,10 +248,8 @@ BPrintJob::BeginJob()
_GetMangledName(mangledName, B_FILE_NAME_LENGTH); _GetMangledName(mangledName, B_FILE_NAME_LENGTH);
path.Append(mangledName); path.Append(mangledName);
if (path.InitCheck() != B_OK) { if (path.InitCheck() != B_OK)
free(printer);
return; return;
}
// TODO: fSpoolFileName should store the name only (not path which can be // TODO: fSpoolFileName should store the name only (not path which can be
// 1024 bytes long) // 1024 bytes long)
@@ -257,7 +257,6 @@ BPrintJob::BeginJob()
fSpoolFile = new BFile(fSpoolFileName, B_READ_WRITE | B_CREATE_FILE); fSpoolFile = new BFile(fSpoolFileName, B_READ_WRITE | B_CREATE_FILE);
if (fSpoolFile->InitCheck() != B_OK) { if (fSpoolFile->InitCheck() != B_OK) {
free(printer);
CancelJob(); CancelJob();
return; return;
} }
@@ -271,7 +270,6 @@ BPrintJob::BeginJob()
if (fSpoolFile->Write(&fSpoolFileHeader, sizeof(print_file_header)) if (fSpoolFile->Write(&fSpoolFileHeader, sizeof(print_file_header))
!= sizeof(print_file_header)) { != sizeof(print_file_header)) {
free(printer);
CancelJob(); CancelJob();
return; return;
} }
@@ -280,7 +278,6 @@ BPrintJob::BeginJob()
if (!fSetupMessage->HasString(PSRV_FIELD_CURRENT_PRINTER)) if (!fSetupMessage->HasString(PSRV_FIELD_CURRENT_PRINTER))
fSetupMessage->AddString(PSRV_FIELD_CURRENT_PRINTER, printer); fSetupMessage->AddString(PSRV_FIELD_CURRENT_PRINTER, printer);
free(printer);
_AddSetupSpec(); _AddSetupSpec();
_NewPage(); _NewPage();