diff options
author | Garming Sam <garming@catalyst.net.nz> | 2014-02-04 15:09:12 +1300 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2014-02-07 16:19:16 -0800 |
commit | 52b1b168b3f29a49c544ae207065fd192aefe864 (patch) | |
tree | c89cd203096ce9fbd4d0a7c97d3c11f1c4c82106 | |
parent | fe9974ca45ec6d9a43d70cea3bd28243e43f785e (diff) | |
download | samba-52b1b168b3f29a49c544ae207065fd192aefe864.tar.gz |
param: rename lp function and variable from "minprintspace" to "min_print_space"
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
-rw-r--r-- | lib/param/param_functions.c | 2 | ||||
-rw-r--r-- | lib/param/param_table.c | 2 | ||||
-rw-r--r-- | source3/param/loadparm.c | 2 | ||||
-rw-r--r-- | source3/printing/printing.c | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index f6d79fb8630..ee220ddf40c 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -134,7 +134,7 @@ FN_LOCAL_BOOL(acl_group_control, acl_group_control) FN_LOCAL_BOOL(acl_map_full_control, acl_map_full_control) FN_LOCAL_BOOL(acl_allow_execute_always, acl_allow_execute_always) FN_LOCAL_INTEGER(default_case, default_case) -FN_LOCAL_INTEGER(minprintspace, minprintspace) +FN_LOCAL_INTEGER(min_print_space, min_print_space) FN_LOCAL_INTEGER(printing, printing) FN_LOCAL_INTEGER(max_reported_print_jobs, max_reported_print_jobs) FN_LOCAL_INTEGER(oplock_contention_limit, oplock_contention_limit) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index 82fad33443e..5c535025898 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -1839,7 +1839,7 @@ static struct parm_struct parm_table[] = { .label = "min print space", .type = P_INTEGER, .p_class = P_LOCAL, - .offset = LOCAL_VAR(minprintspace), + .offset = LOCAL_VAR(min_print_space), .special = NULL, .enum_list = NULL, .flags = FLAG_ADVANCED | FLAG_PRINT, diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 9df88b42fc3..c924f438d62 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -186,7 +186,7 @@ static struct loadparm_service sDefault = .msdfs_proxy = NULL, .aio_write_behind = NULL, .dfree_command = NULL, - .minprintspace = 0, + .min_print_space = 0, .iMaxPrintJobs = 1000, .max_reported_print_jobs = 0, .write_cache_size = 0, diff --git a/source3/printing/printing.c b/source3/printing/printing.c index 5ee711dd26f..2c9eafa4272 100644 --- a/source3/printing/printing.c +++ b/source3/printing/printing.c @@ -2654,8 +2654,8 @@ static WERROR print_job_checks(const struct auth_session_info *server_info, } /* see if we have sufficient disk space */ - if (lp_minprintspace(snum)) { - minspace = lp_minprintspace(snum); + if (lp_min_print_space(snum)) { + minspace = lp_min_print_space(snum); ret = sys_fsusage(lp_path(talloc_tos(), snum), &dspace, &dsize); if (ret == 0 && dspace < 2*minspace) { DEBUG(3, ("print_job_checks: " |