From a9e9cfcd54baa5bdd71a187c41542888a091f220 Mon Sep 17 00:00:00 2001 From: OBATA Akio Date: Mon, 10 Aug 2020 18:29:10 +0900 Subject: Fix missing argments for drive parse filter on lpr It was extended for compressed PPD support, but not refrected to lpr parts. Signed-off-by: OBATA Akio (cherry picked from commit 15116d8f64b35a695bcabc92239667c8684dc545) --- kdeprint/cups/make_driver_db_cups.cpp | 2 +- kdeprint/driverparse.c | 2 +- kdeprint/lpr/make_driver_db_lpr.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kdeprint/cups/make_driver_db_cups.cpp b/kdeprint/cups/make_driver_db_cups.cpp index bc6e4383b..0cd73ba9e 100644 --- a/kdeprint/cups/make_driver_db_cups.cpp +++ b/kdeprint/cups/make_driver_db_cups.cpp @@ -213,7 +213,7 @@ void initCompressedPpd(const char *dirname) // If we were to rerun initPpd here then all drivers would be duplicated! } -int parsePpdFile(const char *filename, const char *origin, const char *metadata, FILE *output_file) +int parsePpdFile(const char *filename, const char * /*origin*/, const char * /*metadata*/, FILE *output_file) { gzFile ppd_file; char line[4096], value[256], langver[64] = {0}, desc[256] = {0}; diff --git a/kdeprint/driverparse.c b/kdeprint/driverparse.c index 5a2459c28..7d6462761 100644 --- a/kdeprint/driverparse.c +++ b/kdeprint/driverparse.c @@ -280,7 +280,7 @@ int getMaticPrinterInfos(const char *base, const char *id, char *make, char *mod return 1; } -int parseMaticFile(const char *driver, const char *origin, const char *metadata, FILE *output) +int parseMaticFile(const char *driver, const char * /*origin*/, const char * /*metadata*/, FILE *output) { FILE *drFile; char name[32] = {0}, diff --git a/kdeprint/lpr/make_driver_db_lpr.c b/kdeprint/lpr/make_driver_db_lpr.c index 848eb967f..b6f3f171b 100644 --- a/kdeprint/lpr/make_driver_db_lpr.c +++ b/kdeprint/lpr/make_driver_db_lpr.c @@ -47,7 +47,7 @@ void simplifyModel(const char *modelname) } } -int parseApsFile(const char *filename, FILE *output) +int parseApsFile(const char *filename, const char * /*origin*/, const char * /*metadata*/, FILE *output) { FILE *apsfile; char buf[256], modelname[256]; @@ -127,7 +127,7 @@ char* nextWord(char *c) return d; } -int parseIfhpFile(const char *filename, FILE *output) +int parseIfhpFile(const char *filename, const char * /*origin*/, const char * /*metadata*/, FILE *output) { char buf[1024]; FILE *in; -- cgit v1.2.1