From 1e41929e6720370a91f71daa4223c57ae76ea12f Mon Sep 17 00:00:00 2001
From: Jai Luthra <luthrajaiji@gmail.com>
Date: Sat, 12 Sep 2020 13:30:00 +0530
Subject: [PATCH] pdftopdf: fix logging issue.

---
 cupsfilters/pdftopdf/intervalset.cc        | 14 +++++-----
 cupsfilters/pdftopdf/nup.cc                |  6 +----
 cupsfilters/pdftopdf/pdftopdf_processor.cc | 30 ++++++----------------
 cupsfilters/pdftopdf/pptypes.cc            | 28 ++++++++++----------
 4 files changed, 29 insertions(+), 49 deletions(-)

diff --git a/cupsfilters/pdftopdf/intervalset.cc b/cupsfilters/pdftopdf/intervalset.cc
index a624a2f44..602fd9e14 100644
--- a/cupsfilters/pdftopdf/intervalset.cc
+++ b/cupsfilters/pdftopdf/intervalset.cc
@@ -110,18 +110,16 @@ void IntervalSet::dump(pdftopdf_doc_t *doc) const // {{{
     return;
   }
   len--;
-  if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_DEBUG,
-      "pdftopdf: ");
   for (int iA=0;iA<len;iA++) {
-    if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_CONTROL,
-	      "[%d,%d),",data[iA].first,data[iA].second);
+    if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_DEBUG,
+	      "pdftopdf: [%d,%d)\n,",data[iA].first,data[iA].second);
   }
   if (data[len].second==npos) {
-    if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_CONTROL,
-	      "[%d,inf)\n",data[len].first);
+    if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_DEBUG,
+	      "pdftopdf: [%d,inf)\n",data[len].first);
   } else {
-    if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_CONTROL,
-	      "[%d,%d)\n",data[len].first,data[len].second);
+    if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_DEBUG,
+	      "pdftopdf: [%d,%d)\n",data[len].first,data[len].second);
   }
 }
 // }}}
diff --git a/cupsfilters/pdftopdf/nup.cc b/cupsfilters/pdftopdf/nup.cc
index 6375576c3..70550f395 100644
--- a/cupsfilters/pdftopdf/nup.cc
+++ b/cupsfilters/pdftopdf/nup.cc
@@ -46,13 +46,9 @@ void NupParameters::dump(pdftopdf_doc_t *doc) const // {{{
   }
 
   if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_DEBUG,
-      "pdftopdf: Alignment: ");
+      "pdftopdf: Alignment:\n");
   Position_dump(xalign,Axis::X,doc);
-  if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_CONTROL,
-      "/");
   Position_dump(yalign,Axis::Y,doc);
-  if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_CONTROL,
-      "\n");
 }
 // }}}
 
diff --git a/cupsfilters/pdftopdf/pdftopdf_processor.cc b/cupsfilters/pdftopdf/pdftopdf_processor.cc
index 53c6168b7..59736f6ef 100644
--- a/cupsfilters/pdftopdf/pdftopdf_processor.cc
+++ b/cupsfilters/pdftopdf/pdftopdf_processor.cc
@@ -8,11 +8,11 @@ void BookletMode_dump(BookletMode bkm,pdftopdf_doc_t *doc) // {{{
 {
   static const char *bstr[3]={"Off","On","Shuffle-Only"};
   if ((bkm<BOOKLET_OFF) || (bkm>BOOKLET_JUSTSHUFFLE)) {
-    if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_CONTROL,
-      "(bad booklet mode: %d)",bkm);
+    if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_DEBUG,
+      "pdftopdf: bookletMode: (bad booklet mode: %d)\n",bkm);
   } else {
-    if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_CONTROL,
-      "%s",bstr[bkm]);
+    if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_DEBUG,
+      "pdftopdf: bookletMode: %s\n",bstr[bkm]);
   }
 }
 // }}}
@@ -44,11 +44,7 @@ void ProcessingParameters::dump(pdftopdf_doc_t *doc) const // {{{
 
   page.dump(doc);
 
-  if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_DEBUG,
-      "pdftopdf: Rotation(CCW): ");
   Rotation_dump(orientation,doc);
-  if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_DEBUG,
-      "pdftopdf: \n");
 
   if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_DEBUG,
       "pdftopdf: paper_is_landscape: %s\n",
@@ -58,11 +54,7 @@ void ProcessingParameters::dump(pdftopdf_doc_t *doc) const // {{{
       "pdftopdf: duplex: %s\n",
 	  (duplex)?"true":"false");
 
-  if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_DEBUG,
-      "pdftopdf: Border: ");
   BorderType_dump(border,doc);
-  if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_DEBUG,
-      "pdftopdf: \n");
 
   nup.dump(doc);
 
@@ -76,7 +68,7 @@ void ProcessingParameters::dump(pdftopdf_doc_t *doc) const // {{{
 	  (oddPages)?"true":"false");
 
   if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_DEBUG,
-      "pdftopdf: page range: ");
+      "pdftopdf: page range: \n");
   pageRange.dump(doc);
 
   if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_DEBUG,
@@ -84,13 +76,9 @@ void ProcessingParameters::dump(pdftopdf_doc_t *doc) const // {{{
 	  (mirror)?"true":"false");
 
   if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_DEBUG,
-      "pdftopdf: Position: ");
+      "pdftopdf: Position:\n");
   Position_dump(xpos,Axis::X,doc);
-  if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_CONTROL,
-      "/");
   Position_dump(ypos,Axis::Y,doc);
-  if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_CONTROL,
-      "\n");
 
   if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_DEBUG,
       "pdftopdf: collate: %s\n",
@@ -104,11 +92,9 @@ void ProcessingParameters::dump(pdftopdf_doc_t *doc) const // {{{
       "pdftopdf: pageLabel: %s\n",
 	  pageLabel.empty () ? "(none)" : pageLabel.c_str());
 
-  if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_DEBUG,
-      "pdftopdf: bookletMode: ");
   BookletMode_dump(booklet,doc);
-  if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_CONTROL,
-      "\nbooklet signature: %d\n",
+  if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_DEBUG,
+      "pdftopdf: booklet signature: %d\n",
 	  bookSignature);
 
   if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_DEBUG,
diff --git a/cupsfilters/pdftopdf/pptypes.cc b/cupsfilters/pdftopdf/pptypes.cc
index 3298e5b55..194d9db48 100644
--- a/cupsfilters/pdftopdf/pptypes.cc
+++ b/cupsfilters/pdftopdf/pptypes.cc
@@ -20,18 +20,18 @@ void Position_dump(Position pos,Axis axis,pdftopdf_doc_t *doc) // {{{
 {
   assert((axis == Axis::X) || (axis == Axis::Y));
   if ((pos < LEFT) || (pos > RIGHT)) {
-    if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_CONTROL,
-      "(bad position: %d)",pos);
+    if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_DEBUG,
+      "pdftopdf: Position %s: (bad position: %d)", (axis == Axis::X) ? "X" : "Y", pos);
     return;
   }
   if (axis==Axis::X) {
     static const char *pxstr[3]={"Left","Center","Right"};
-    if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_CONTROL,
-      "%s", pxstr[pos+1]);
+    if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_DEBUG,
+      "pdftopdf: Position X: %s\n", pxstr[pos+1]);
   } else {
     static const char *pystr[3]={"Bottom","Center","Top"};
-    if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_CONTROL,
-      "%s",pystr[pos+1]);
+    if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_DEBUG,
+      "pdftopdf: Position Y: %s\n",pystr[pos+1]);
   }
 }
 // }}}
@@ -40,11 +40,11 @@ void Rotation_dump(Rotation rot,pdftopdf_doc_t *doc) // {{{
 {
   static const char *rstr[4]={"0 deg","90 deg","180 deg","270 deg"}; // CCW
   if ((rot < ROT_0) || (rot > ROT_270)) {
-    if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_CONTROL,
-      "(bad rotation: %d)",rot);
+    if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_DEBUG,
+      "pdftopdf: Rotation(CCW): (bad rotation: %d)\n",rot);
   } else {
-    if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_CONTROL,
-      "%s",rstr[rot]);
+    if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_DEBUG,
+      "pdftopdf: Rotation(CCW): %s\n",rstr[rot]);
   }
 }
 // }}}
@@ -70,12 +70,12 @@ Rotation operator-(Rotation rhs) // {{{
 void BorderType_dump(BorderType border,pdftopdf_doc_t *doc) // {{{
 {
   if ((border < NONE) || (border == 1) || (border > TWO_THICK)) {
-    if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_CONTROL,
-      "(bad border: %d)",border);
+    if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_DEBUG,
+      "pdftopdf: Border: (bad border: %d)\n",border);
   } else {
     static const char *bstr[6]={"None",NULL,"one thin","one thick","two thin","two thick"};
-    if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_CONTROL,
-      "%s",bstr[border]);
+    if (doc->logfunc) doc->logfunc(doc->logdata, FILTER_LOGLEVEL_DEBUG,
+      "pdftopdf: Border: %s\n",bstr[border]);
   }
 }
 // }}}
-- 
2.47.2