Djam/hplip
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/hplip.git synced 2025-02-24 00:42:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
hplip/hplip-dbglog-newline.patch
Rosa b0d9109826 Automatic import for version 3.11.5
2012-02-01 15:16:03 +04:00

205 lines
8.3 KiB
Diff
Raw Permalink Blame History

diff -Naurp hplip-3.11.5/prnt/hpcups/HPCupsFilter.cpp hplip-3.11.5.oden/prnt/hpcups/HPCupsFilter.cpp
--- hplip-3.11.5/prnt/hpcups/HPCupsFilter.cpp 2011-05-15 19:44:05.955883969 +0200
+++ hplip-3.11.5.oden/prnt/hpcups/HPCupsFilter.cpp 2011-05-15 19:42:20.480884033 +0200
@@ -350,7 +350,7 @@ DRIVER_ERROR HPCupsFilter::startPage (cu
(attr->value != NULL)) {
strncpy(m_JA.printer_platform, attr->value, sizeof(m_JA.printer_platform)-1);
if (m_iLogLevel & BASIC_LOG) {
- dbglog("HPCUPS: found Printer Platform, it is - %s", attr->value);
+ dbglog("HPCUPS: found Printer Platform, it is - %s\n", attr->value);
}
if(strcmp(m_JA.printer_platform, "ljzjscolor") == 0)
{
@@ -370,7 +370,7 @@ DRIVER_ERROR HPCupsFilter::startPage (cu
}
strncpy(m_JA.printer_language, attr->value, sizeof(m_JA.printer_language)-1);
if (m_iLogLevel & BASIC_LOG) {
- dbglog("HPCUPS: found Printer Language, it is - %s", attr->value);
+ dbglog("HPCUPS: found Printer Language, it is - %s\n", attr->value);
}
// Fill in the other PCL header info
@@ -415,14 +415,14 @@ DRIVER_ERROR HPCupsFilter::startPage (cu
{
if (err == PLUGIN_LIBRARY_MISSING)
fputs ("STATE: +hplip.plugin-error\n", stderr);
- dbglog ("m_Job initialization failed with error = %d", err);
+ dbglog ("m_Job initialization failed with error = %d\n", err);
ppdClose(m_ppd);
m_ppd = NULL;
return err;
}
if (m_iLogLevel & BASIC_LOG) {
- dbglog("HPCUPS: returning NO_ERROR from startPage");
+ dbglog("HPCUPS: returning NO_ERROR from startPage\n");
}
m_pPrinterBuffer = new BYTE[cups_header->cupsWidth * 4 + 32];
@@ -509,7 +509,7 @@ int HPCupsFilter::StartPrintJob(int arg
close(fd);
}
if (m_iLogLevel & BASIC_LOG)
- dbglog("HPCUPS: processRasterData returned %d, calling closeFilter()", err);
+ dbglog("HPCUPS: processRasterData returned %d, calling closeFilter()\n", err);
closeFilter();
cupsRasterClose(cups_raster);
return 1;
@@ -519,7 +519,7 @@ int HPCupsFilter::StartPrintJob(int arg
close(fd);
}
if (m_iLogLevel & BASIC_LOG)
- dbglog("HPCUPS: StartPrintJob end of job, calling closeFilter()");
+ dbglog("HPCUPS: StartPrintJob end of job, calling closeFilter()\n");
closeFilter();
cupsRasterClose(cups_raster);
return 0;
diff -Naurp hplip-3.11.5/prnt/hpcups/Lidil.cpp hplip-3.11.5.oden/prnt/hpcups/Lidil.cpp
--- hplip-3.11.5/prnt/hpcups/Lidil.cpp 2011-05-14 20:24:00.000000000 +0200
+++ hplip-3.11.5.oden/prnt/hpcups/Lidil.cpp 2011-05-15 19:43:34.300883972 +0200
@@ -103,7 +103,7 @@ DRIVER_ERROR Lidil::Configure(Pipeline *
if (m_pPM->BaseResX != m_pQA->horizontal_resolution ||
m_pPM->BaseResY != m_pQA->vertical_resolution)
{
- dbglog("Requested resolution not supported with requested printmode");
+ dbglog("Requested resolution not supported with requested printmode\n");
return UNSUPPORTED_PRINTMODE;
}
@@ -166,7 +166,7 @@ DRIVER_ERROR Lidil::StartJob(SystemServi
if (!selectPrintMode())
{
- dbglog("selectPrintMode failed, PrintMode name = %s", m_pQA->print_mode_name);
+ dbglog("selectPrintMode failed, PrintMode name = %s\n", m_pQA->print_mode_name);
return UNSUPPORTED_PRINTMODE;
}
@@ -174,7 +174,7 @@ DRIVER_ERROR Lidil::StartJob(SystemServi
if (m_pPM->BaseResX != m_pQA->horizontal_resolution ||
m_pPM->BaseResY != m_pQA->vertical_resolution)
{
- dbglog("Requested resolution not supported with requested printmode");
+ dbglog("Requested resolution not supported with requested printmode\n");
dbglog(" m_pPM->BaseResX = %d\n",m_pPM->BaseResX);
dbglog(" m_pPM->BaseResY = %d\n",m_pPM->BaseResY);
dbglog(" m_pQA->horizontal_resolution = %d\n",m_pQA->horizontal_resolution);
@@ -193,7 +193,7 @@ DRIVER_ERROR Lidil::StartJob(SystemServi
err = allocateSwathBuffers();
if (err != NO_ERROR)
{
- dbglog("allocateSwathBuffers failed, err = %d", err);
+ dbglog("allocateSwathBuffers failed, err = %d\n", err);
return err;
}
@@ -625,7 +625,7 @@ bool Lidil::selectPrintMode()
{
if (m_pJA->printer_platform[0] == 0)
{
- dbglog("printer_platform is undefined");
+ dbglog("printer_platform is undefined\n");
return false;
}
for (unsigned int i = 0; i < sizeof(lidil_print_modes_table) / sizeof(lidil_print_modes_table[0]); i++)
@@ -635,7 +635,7 @@ bool Lidil::selectPrintMode()
return selectPrintMode(i);
}
}
- dbglog("Unsupported printer_platform: %s", m_pJA->printer_platform);
+ dbglog("Unsupported printer_platform: %s\n", m_pJA->printer_platform);
return false;
}
diff -Naurp hplip-3.11.5/prnt/hpcups/Pcl3.cpp hplip-3.11.5.oden/prnt/hpcups/Pcl3.cpp
--- hplip-3.11.5/prnt/hpcups/Pcl3.cpp 2011-05-14 20:24:00.000000000 +0200
+++ hplip-3.11.5.oden/prnt/hpcups/Pcl3.cpp 2011-05-15 19:42:20.482884014 +0200
@@ -66,13 +66,13 @@ DRIVER_ERROR Pcl3::Configure(Pipeline **
if (!selectPrintMode())
{
- dbglog("selectPrintMode failed, PrintMode name = %s", m_pQA->print_mode_name);
+ dbglog("selectPrintMode failed, PrintMode name = %s\n", m_pQA->print_mode_name);
return UNSUPPORTED_PRINTMODE;
}
if (m_pPM->BaseResX != m_pQA->horizontal_resolution ||
m_pPM->BaseResY != m_pQA->vertical_resolution)
{
- dbglog("Requested resolution not supported with requested printmode");
+ dbglog("Requested resolution not supported with requested printmode\n");
return UNSUPPORTED_PRINTMODE;
}
@@ -220,7 +220,7 @@ void Pcl3::configureRasterData()
{
if (m_pPM == NULL)
{
- dbglog("configureRasterData: m_pPM is NULL");
+ dbglog("configureRasterData: m_pPM is NULL\n");
return;
}
BYTE *p = cur_pcl_buffer_ptr;
@@ -255,7 +255,7 @@ bool Pcl3::selectPrintMode()
{
if (m_pJA->printer_platform[0] == 0)
{
- dbglog("printer_platform is undefined");
+ dbglog("printer_platform is undefined\n");
return false;
}
for (unsigned int i = 0; i < sizeof(pcl3_print_modes_table) / sizeof(pcl3_print_modes_table[0]); i++)
@@ -265,7 +265,7 @@ bool Pcl3::selectPrintMode()
return selectPrintMode(i);
}
}
- dbglog("Unsupported printer_platform: %s", m_pJA->printer_platform);
+ dbglog("Unsupported printer_platform: %s\n", m_pJA->printer_platform);
return false;
}
diff -Naurp hplip-3.11.5/prnt/hpcups/Pcl3Gui.cpp hplip-3.11.5.oden/prnt/hpcups/Pcl3Gui.cpp
--- hplip-3.11.5/prnt/hpcups/Pcl3Gui.cpp 2011-05-14 20:24:00.000000000 +0200
+++ hplip-3.11.5.oden/prnt/hpcups/Pcl3Gui.cpp 2011-05-15 19:42:20.485883974 +0200
@@ -66,13 +66,13 @@ DRIVER_ERROR Pcl3Gui::Configure(Pipeline
if (!selectPrintMode())
{
- dbglog("selectPrintMode failed, PrintMode name = %s", m_pQA->print_mode_name);
+ dbglog("selectPrintMode failed, PrintMode name = %s\n", m_pQA->print_mode_name);
return UNSUPPORTED_PRINTMODE;
}
if (m_pPM->BaseResX != m_pQA->horizontal_resolution ||
m_pPM->BaseResY != m_pQA->vertical_resolution)
{
- dbglog("Requested resolution not supported with requested printmode");
+ dbglog("Requested resolution not supported with requested printmode\n");
return UNSUPPORTED_PRINTMODE;
}
@@ -224,7 +224,7 @@ void Pcl3Gui::configureRasterData()
{
if (m_pPM == NULL)
{
- dbglog("configureRasterData: m_pPM is NULL");
+ dbglog("configureRasterData: m_pPM is NULL\n");
return;
}
BYTE *p = cur_pcl_buffer_ptr;
@@ -259,7 +259,7 @@ bool Pcl3Gui::selectPrintMode()
{
if (m_pJA->printer_platform[0] == 0)
{
- dbglog("printer_platform is undefined");
+ dbglog("printer_platform is undefined\n");
return false;
}
for (unsigned int i = 0; i < sizeof(pcl3_gui_print_modes_table) / sizeof(pcl3_gui_print_modes_table[0]); i++)
@@ -269,7 +269,7 @@ bool Pcl3Gui::selectPrintMode()
return selectPrintMode(i);
}
}
- dbglog("Unsupported printer_platform: %s", m_pJA->printer_platform);
+ dbglog("Unsupported printer_platform: %s\n", m_pJA->printer_platform);
return false;
}
Reference in a new issue View git blame Copy permalink