dany/brlaser
1
0
Fork 0
mirror of https://github.com/pdewacht/brlaser synced 2025-04-07 13:16:43 +02:00
Code Issues Projects Releases Wiki Activity

Add package name to all log messages

Browse Source
This commit is contained in:
Peter De Wachter 2017-10-30 20:07:27 +01:00
parent 931c677443
commit 718053fa36
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/debug.cc
View File

@ -15,6 +15,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with brlaser. If not, see <http://www.gnu.org/licenses/>. // along with brlaser. If not, see <http://www.gnu.org/licenses/>.
#include "config.h"
#include "debug.h" #include "debug.h"
#include <iostream> #include <iostream>
#include <typeinfo> #include <typeinfo>
@ -23,12 +24,12 @@ namespace {
template <typename T> template <typename T>
void dump(const char *name, const T &value) { void dump(const char *name, const T &value) {
std::cerr << "DEBUG: page header: " << name << " = " << value << '\n'; std::cerr << "DEBUG: " PACKAGE ": page header: " << name << " = " << value << '\n';
} }
template <typename T, int N> template <typename T, int N>
void dump(const char *name, const T (&value)[N]) { void dump(const char *name, const T (&value)[N]) {
std::cerr << "DEBUG: page header: " << name << " ="; std::cerr << "DEBUG: " PACKAGE ": page header: " << name << " =";
for (int i = 0; i < N; ++i) { for (int i = 0; i < N; ++i) {
std::cerr << ' ' << value[i]; std::cerr << ' ' << value[i];
} }
@ -36,12 +37,12 @@ void dump(const char *name, const T (&value)[N]) {
} }
void dump(const char *name, const char *value) { void dump(const char *name, const char *value) {
std::cerr << "DEBUG: page header: " << name << " = \"" << value << "\"\n"; std::cerr << "DEBUG: " PACKAGE ": page header: " << name << " = \"" << value << "\"\n";
} }
template <int N, int M> template <int N, int M>
void dump(const char *name, const char (&value)[N][M]) { void dump(const char *name, const char (&value)[N][M]) {
std::cerr << "DEBUG: page header: " << name << " ="; std::cerr << "DEBUG: " PACKAGE ": page header: " << name << " =";
for (int i = 0; i < N; ++i) { for (int i = 0; i < N; ++i) {
std::cerr << " \"" << value[i] << '"'; std::cerr << " \"" << value[i] << '"';
} }

12
src/main.cc
View File

@ -151,14 +151,14 @@ int main(int argc, char *argv[]) {
if (job_filename) { if (job_filename) {
fd = open(job_filename, O_RDONLY); fd = open(job_filename, O_RDONLY);
if (fd < 0) { if (fd < 0) {
fprintf(stderr, "ERROR: Unable to open raster file\n"); fprintf(stderr, "ERROR: " PACKAGE ": Unable to open raster file\n");
return 1; return 1;
} }
} }
ras = cupsRasterOpen(fd, CUPS_RASTER_READ); ras = cupsRasterOpen(fd, CUPS_RASTER_READ);
if (!ras) { if (!ras) {
fprintf(stderr, "ERROR: Can't read raster data\n"); fprintf(stderr, "ERROR: " PACKAGE ": Can't read raster data\n");
return 1; return 1;
} }
@ -170,12 +170,12 @@ int main(int argc, char *argv[]) {
|| header.cupsBitsPerColor != 1 || header.cupsBitsPerColor != 1
|| header.cupsNumColors != 1 || header.cupsNumColors != 1
|| header.cupsBytesPerLine > 10000) { || header.cupsBytesPerLine > 10000) {
fprintf(stderr, "ERROR: Page %d: Bogus raster data.\n", pages + 1); fprintf(stderr, "ERROR: " PACKAGE ": Page %d: Bogus raster data.\n", pages + 1);
dump_page_header(header); dump_page_header(header);
return 1; return 1;
} }
if (pages == 0) { if (pages == 0) {
fprintf(stderr, "DEBUG: Page header of first page\n"); fprintf(stderr, "DEBUG: " PACKAGE ": Page header of first page\n");
dump_page_header(header); dump_page_header(header);
} }
job.encode_page(build_page_params(), job.encode_page(build_page_params(),
@ -187,13 +187,13 @@ int main(int argc, char *argv[]) {
} }
if (pages == 0) { if (pages == 0) {
fprintf(stderr, "ERROR: No pages were found.\n"); fprintf(stderr, "ERROR: " PACKAGE ": No pages were found.\n");
return 1; return 1;
} }
fflush(stdout); fflush(stdout);
if (ferror(stdout)) { if (ferror(stdout)) {
fprintf(stderr, "ERROR: Could not write print data\n"); fprintf(stderr, "ERROR: " PACKAGE ": Could not write print data\n");
return 1; return 1;
} }
return 0; return 0;