From e69de9ddfb89c90c6ca7fe3925e2db3fe611f5a0 Mon Sep 17 00:00:00 2001 From: Till Kamppeter Date: Wed, 6 Apr 2022 12:37:46 +0200 Subject: [PATCH] libcupsfilters: Rename API functions of colord.h to "cf..." --- cupsfilters/colord.c | 10 +++++----- cupsfilters/colord.h | 12 ++++++------ cupsfilters/colormanager.c | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cupsfilters/colord.c b/cupsfilters/colord.c index 6459197a1..68aa3418e 100644 --- a/cupsfilters/colord.c +++ b/cupsfilters/colord.c @@ -44,7 +44,7 @@ MIT Open Source License - http://www.opensource.org/ #define QUAL_SIZE 3 char ** -colord_get_qualifier_for_ppd (ppd_file_t *ppd) +cfColordGetQualifierForPPD (ppd_file_t *ppd) { char q_keyword[PPD_MAX_NAME]; char **tuple = NULL; @@ -325,7 +325,7 @@ out: } char * -colord_get_profile_for_device_id (filter_data_t *data, +cfColordGetProfileForDeviceID (filter_data_t *data, const char *device_id, const char **qualifier_tuple) { @@ -443,7 +443,7 @@ out: } int -colord_get_inhibit_for_device_id (filter_data_t *data, +cfColordGetInhibitForDeviceID (filter_data_t *data, const char *device_id) { filter_logfunc_t log = data->logfunc; @@ -481,7 +481,7 @@ out: #else char * -colord_get_profile_for_device_id (filter_data_t *data, +cfColordGetProfileForDeviceID (filter_data_t *data, const char *device_id, const char **qualifier_tuple) { @@ -493,7 +493,7 @@ colord_get_profile_for_device_id (filter_data_t *data, } int -colord_get_inhibit_for_device_id (filter_data_t *data, +cfColordGetInhibitForDeviceID (filter_data_t *data, const char *device_id) { filter_logfunc_t log = data->logfunc; diff --git a/cupsfilters/colord.h b/cupsfilters/colord.h index f4867e595..03b024ef4 100644 --- a/cupsfilters/colord.h +++ b/cupsfilters/colord.h @@ -38,12 +38,12 @@ extern "C" { #include #include -char **colord_get_qualifier_for_ppd (ppd_file_t *ppd); -char *colord_get_profile_for_device_id (filter_data_t *data, - const char *device_id, - const char **qualifier_tuple); -int colord_get_inhibit_for_device_id ( filter_data_t *data, - const char *device_id); +char **cfColordGetQualifierForPPD(ppd_file_t *ppd); +char *cfColordGetProfileForDeviceID(filter_data_t *data, + const char *device_id, + const char **qualifier_tuple); +int cfColordGetInhibitForDeviceID(filter_data_t *data, + const char *device_id); # ifdef __cplusplus } diff --git a/cupsfilters/colormanager.c b/cupsfilters/colormanager.c index a1ff5aa52..49505f0c9 100644 --- a/cupsfilters/colormanager.c +++ b/cupsfilters/colormanager.c @@ -227,7 +227,7 @@ _get_colord_printer_cm_status( filter_data_t *data) /* Check if device is inhibited/disabled in colord */ printer_id = _get_colord_printer_id(data); - is_printer_cm_disabled = colord_get_inhibit_for_device_id (data, printer_id); + is_printer_cm_disabled = cfColordGetInhibitForDeviceID (data, printer_id); if (printer_id != NULL) free(printer_id); @@ -258,12 +258,12 @@ _get_colord_profile(filter_data_t *data, /* Get color qualifier triple */ - qualifier = colord_get_qualifier_for_ppd(ppd); + qualifier = cfColordGetQualifierForPPD(ppd); if (qualifier != NULL) { printer_id = _get_colord_printer_id(data); /* Get profile from colord using qualifiers */ - icc_profile = colord_get_profile_for_device_id (data, + icc_profile = cfColordGetProfileForDeviceID (data, (const char *)printer_id, (const char **)qualifier); } -- 2.47.3