param: Rename variable used for lp__printername szPrintername

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 933afcb83f2fc7f69ee10abca389ca865e91c644..45a1138b873a50147ec9b1e8b02036df16d73126 100644 (file)
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -783,7 +783,7 @@ bool lpcfg_add_printer(struct loadparm_context *lp_ctx,
        /* entry (if/when the 'available' keyword is implemented!).    */
 
        /* the printer name is set to the service name. */
-       lpcfg_string_set(service, &service->szPrintername, pszPrintername);
+       lpcfg_string_set(service, &service->_printername, pszPrintername);
        lpcfg_string_set(service, &service->comment, comment);
        service->browseable = default_service->browseable;
        /* Printers cannot be read_only. */
@@ -2654,8 +2654,8 @@ const char *lpcfg_volume_label(struct loadparm_service *service, struct loadparm
 const char *lpcfg_printername(struct loadparm_service *service, struct loadparm_service *sDefault)
 {
        const char *ret;
-       ret = lp_string((const char *)((service != NULL && service->szPrintername != NULL) ?
-                                      service->szPrintername : sDefault->szPrintername));
+       ret = lp_string((const char *)((service != NULL && service->_printername != NULL) ?
+                                      service->_printername : sDefault->_printername));
        if (ret == NULL || (ret != NULL && *ret == '\0'))
                ret = lpcfg_servicename(service);
 

diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index 495e6279c64dc185fec2862b8a08655983d2e6b0..a32211dd1a116a1afe17b6b67cafdb05f1bfbbbd 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -63,7 +63,7 @@ FN_LOCAL_STRING(lppausecommand, lppausecommand)
 FN_LOCAL_STRING(lpresumecommand, lpresumecommand)
 FN_LOCAL_STRING(queuepausecommand, queuepausecommand)
 FN_LOCAL_STRING(queueresumecommand, queueresumecommand)
-FN_LOCAL_STRING(_printername, szPrintername)
+FN_LOCAL_STRING(_printername, _printername)
 FN_LOCAL_CONST_STRING(printjob_username, printjob_username)
 FN_LOCAL_STRING(magicscript, magicscript)
 FN_LOCAL_STRING(magicoutput, magicoutput)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 0e469a219bcfc8953919d23a4ae8eccb036e03a3..49fc7b2b11914fa2063c3ca775ef7dd404069c0f 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -2294,7 +2294,7 @@ static struct parm_struct parm_table[] = {
                .label          = "printer name",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(szPrintername),
+               .offset         = LOCAL_VAR(_printername),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_PRINT,
@@ -2303,7 +2303,7 @@ static struct parm_struct parm_table[] = {
                .label          = "printer",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(szPrintername),
+               .offset         = LOCAL_VAR(_printername),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index e5a427121eaafadfc2885bcde9c4eef6c317c298..c5e94d494f785fda342402d58b96ffab62a06d25 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -165,7 +165,7 @@ static struct loadparm_service sDefault =
        .lpresumecommand = NULL,
        .queuepausecommand = NULL,
        .queueresumecommand = NULL,
-       .szPrintername = NULL,
+       ._printername = NULL,
        .printjob_username = NULL,
        .dontdescend = NULL,
        .hostsallow = NULL,
@@ -1825,7 +1825,7 @@ bool lp_add_printer(const char *pszPrintername, int iDefaultService)
        /* entry (if/when the 'available' keyword is implemented!).    */
 
        /* the printer name is set to the service name. */
-       string_set(&ServicePtrs[i]->szPrintername, pszPrintername);
+       string_set(&ServicePtrs[i]->_printername, pszPrintername);
        string_set(&ServicePtrs[i]->comment, comment);
 
        /* set the browseable flag from the gloabl default */