From 373245680592f746e19e1218de9ded96f50b46c1 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Tue, 21 Jul 2015 14:31:43 +0200 Subject: [PATCH] param: rename szPrintcapName -> printcap_name Signed-off-by: Michael Adam Reviewed-by: Jeremy Allison --- lib/param/loadparm.h | 2 +- lib/param/param_table.c | 4 ++-- source3/param/loadparm.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h index 2c40563fc8c..46c683eef44 100644 --- a/lib/param/loadparm.h +++ b/lib/param/loadparm.h @@ -249,7 +249,7 @@ enum case_handling {CASE_LOWER,CASE_UPPER}; #define LOADPARM_EXTRA_GLOBALS \ struct parmlist_entry *param_opt; \ char *realm_original; \ - char *szPrintcapname; \ + char *printcap_name; \ int CupsEncrypt; \ char *szIdmapUID; \ char *szIdmapGID; \ diff --git a/lib/param/param_table.c b/lib/param/param_table.c index 02f6e56d1b0..f2a737b4539 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -1917,7 +1917,7 @@ struct parm_struct parm_table[] = { .label = "printcap name", .type = P_STRING, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(szPrintcapname), + .offset = GLOBAL_VAR(printcap_name), .special = NULL, .enum_list = NULL, }, @@ -1925,7 +1925,7 @@ struct parm_struct parm_table[] = { .label = "printcap", .type = P_STRING, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(szPrintcapname), + .offset = GLOBAL_VAR(printcap_name), .special = NULL, .enum_list = NULL, .flags = FLAG_SYNONYM, diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index d19e144b626..b1a404acfe3 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -4155,9 +4155,9 @@ int lp_maxprintjobs(int snum) const char *lp_printcapname(void) { - if ((Globals.szPrintcapname != NULL) && - (Globals.szPrintcapname[0] != '\0')) - return Globals.szPrintcapname; + if ((Globals.printcap_name != NULL) && + (Globals.printcap_name[0] != '\0')) + return Globals.printcap_name; if (sDefault.printing == PRINT_CUPS) { return "cups"; -- 2.11.4.GIT