diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-02-04 15:09:06 +1300 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-02-07 16:19:14 -0800 |
| commit | 3fda1fa96f6d8a36bad2d18b4c4e7fc4a679466f (patch) | |
| tree | 7fcbb5edf5652386bab9112ec6341a081423f680 /source3 | |
| parent | d3460a798a03872bf3d30391799162c1c4358e9d (diff) | |
| download | samba-3fda1fa96f6d8a36bad2d18b4c4e7fc4a679466f.tar.gz | |
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>
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/param/loadparm.c | 2 | ||||
| -rw-r--r-- | source3/printing/printing.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 9f18f6c261a..44aebdde631 100644 --- 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 f9406f27e57..62c95f5cb35 100644 --- 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 |