param: rename lp function and variable from "lpqcachetime" to "lpq_cache_time"

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index 48b92fec020933aec035e7e5b20395d01e7c914c..5d000959cc87a0f9f0f5296767d796d7bc84d09d 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -306,7 +306,7 @@ FN_GLOBAL_INTEGER(ldap_timeout, ldap_timeout)
 FN_GLOBAL_INTEGER(lm_announce, lm_announce)
 FN_GLOBAL_INTEGER(lm_interval, lm_interval)
 FN_GLOBAL_INTEGER(lock_spin_time, lock_spin_time)
-FN_GLOBAL_INTEGER(lpqcachetime, lpqcachetime)
+FN_GLOBAL_INTEGER(lpq_cache_time, lpq_cache_time)
 FN_GLOBAL_INTEGER(machine_password_timeout, machine_password_timeout)
 FN_GLOBAL_INTEGER(mangle_prefix, mangle_prefix)
 FN_GLOBAL_INTEGER(map_to_guest, map_to_guest)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index d6fc5a791e60aa6e0a05d934b36a28cad29d7cfe..24bbbb9f810546465138baa77e4e4bae58fb631d 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -1794,7 +1794,7 @@ static struct parm_struct parm_table[] = {
                .label          = "lpq cache time",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(lpqcachetime),
+               .offset         = GLOBAL_VAR(lpq_cache_time),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 9f18f6c261adcc44abf18ce2fbd13281ead6131d..44aebdde631fb1f54348be8a12fcbcd684294f53 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -810,7 +810,7 @@ static void init_globals(bool reinit_globals)
        /* Discovered by 2 days of pain by Don McCall @ HP :-). */
        Globals.max_xmit = 0x4104;
        Globals.maxmux = 50;    /* This is *needed* for profile support. */
-       Globals.lpqcachetime = 30;      /* changed to handle large print servers better -- jerry */
+       Globals.lpq_cache_time = 30;    /* changed to handle large print servers better -- jerry */
        Globals._disable_spoolss = false;
        Globals.max_smbd_processes = 0;/* no limit specified */
        Globals.usernamelevel = 0;

diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index f9406f27e57a8e9664b54b93778e5e04c699264a..62c95f5cb35b9418e19af694ddf3a61e20978b74 100644 (file)
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -1316,7 +1316,7 @@ static bool print_cache_expired(const char *sharename, bool check_pending)
         */
 
        if (last_qscan_time == ((time_t)-1)
-               || (time_now - last_qscan_time) >= lp_lpqcachetime()
+               || (time_now - last_qscan_time) >= lp_lpq_cache_time()
                || last_qscan_time > (time_now + MAX_CACHE_VALID_TIME))
        {
                uint32 u;
@@ -1325,7 +1325,7 @@ static bool print_cache_expired(const char *sharename, bool check_pending)
                DEBUG(4, ("print_cache_expired: cache expired for queue %s "
                        "(last_qscan_time = %d, time now = %d, qcachetime = %d)\n",
                        sharename, (int)last_qscan_time, (int)time_now,
-                       (int)lp_lpqcachetime() ));
+                       (int)lp_lpq_cache_time() ));
 
                /* check if another smbd has already sent a message to update the
                   queue.  Give the pending message one minute to clear and