From 6c1a6532d5429b1dd5c23760b5f6dcd31cb2dbd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Tue, 22 Oct 2013 18:35:40 +0200 Subject: [PATCH] PrintJob.cpp: use MemoryDeleter. --- src/kits/interface/PrintJob.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/kits/interface/PrintJob.cpp b/src/kits/interface/PrintJob.cpp index 90d023b956..fe8b234777 100644 --- a/src/kits/interface/PrintJob.cpp +++ b/src/kits/interface/PrintJob.cpp @@ -32,6 +32,7 @@ #include #include +#include #include #include @@ -239,6 +240,7 @@ BPrintJob::BeginJob() char *printer = _GetCurrentPrinterName(); if (printer == NULL) return; + MemoryDeleter _(printer); path.Append(printer); @@ -246,10 +248,8 @@ BPrintJob::BeginJob() _GetMangledName(mangledName, B_FILE_NAME_LENGTH); path.Append(mangledName); - if (path.InitCheck() != B_OK) { - free(printer); + if (path.InitCheck() != B_OK) return; - } // TODO: fSpoolFileName should store the name only (not path which can be // 1024 bytes long) @@ -257,7 +257,6 @@ BPrintJob::BeginJob() fSpoolFile = new BFile(fSpoolFileName, B_READ_WRITE | B_CREATE_FILE); if (fSpoolFile->InitCheck() != B_OK) { - free(printer); CancelJob(); return; } @@ -271,7 +270,6 @@ BPrintJob::BeginJob() if (fSpoolFile->Write(&fSpoolFileHeader, sizeof(print_file_header)) != sizeof(print_file_header)) { - free(printer); CancelJob(); return; } @@ -280,7 +278,6 @@ BPrintJob::BeginJob() if (!fSetupMessage->HasString(PSRV_FIELD_CURRENT_PRINTER)) fSetupMessage->AddString(PSRV_FIELD_CURRENT_PRINTER, printer); - free(printer); _AddSetupSpec(); _NewPage();