diff options
author | Garance A Drosehn <gad@FreeBSD.org> | 2002-06-16 01:51:37 +0000 |
---|---|---|
committer | Garance A Drosehn <gad@FreeBSD.org> | 2002-06-16 01:51:37 +0000 |
commit | c9cb13a07b961bdb85bfdca2eb980e0f74f0feea (patch) | |
tree | 72bc80e4e7f3be12737367388ae7f07ce5bb4df0 /usr.sbin/lpr | |
parent | 5b1c34fbb705ccbe0872f49c24e61b2c2bd792aa (diff) | |
download | src-c9cb13a07b961bdb85bfdca2eb980e0f74f0feea.tar.gz src-c9cb13a07b961bdb85bfdca2eb980e0f74f0feea.zip |
Just rename two generic-queue init routines from 'init_*' to '*_gi'
("gi" short for 'generic init'...).
MFC after: 10 days
Notes
Notes:
svn path=/head/; revision=98279
Diffstat (limited to 'usr.sbin/lpr')
-rw-r--r-- | usr.sbin/lpr/lpc/cmds.c | 6 | ||||
-rw-r--r-- | usr.sbin/lpr/lpc/cmdtab.c | 4 | ||||
-rw-r--r-- | usr.sbin/lpr/lpc/extern.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/usr.sbin/lpr/lpc/cmds.c b/usr.sbin/lpr/lpc/cmds.c index d49f9d09ca8c..8e28d10e19db 100644 --- a/usr.sbin/lpr/lpc/cmds.c +++ b/usr.sbin/lpr/lpc/cmds.c @@ -692,7 +692,7 @@ have_res: */ void -init_clean(int argc, char *argv[]) +clean_gi(int argc, char *argv[]) { /* init some fields before 'clean' is called for each queue */ @@ -723,12 +723,12 @@ init_clean(int argc, char *argv[]) } void -init_tclean(int argc, char *argv[]) +tclean_gi(int argc, char *argv[]) { /* only difference between 'clean' and 'tclean' is one value */ /* (...and the fact that 'clean' is priv and 'tclean' is not) */ - init_clean(argc, argv); + clean_gi(argc, argv); cln_testonly = 1; return; diff --git a/usr.sbin/lpr/lpc/cmdtab.c b/usr.sbin/lpr/lpc/cmdtab.c index 7664dd539adb..73dad39d4cc9 100644 --- a/usr.sbin/lpr/lpc/cmdtab.c +++ b/usr.sbin/lpr/lpc/cmdtab.c @@ -70,7 +70,7 @@ char uphelp[] = "enable everything and restart spooling daemon"; struct cmd cmdtab[] = { { "abort", aborthelp, PR, 0, abort_q }, - { "clean", cleanhelp, PR, init_clean, clean_q }, + { "clean", cleanhelp, PR, clean_gi, clean_q }, { "enable", enablehelp, PR, 0, enable_q }, { "exit", quithelp, 0, quit, 0 }, { "disable", disablehelp, PR, 0, disable_q }, @@ -82,7 +82,7 @@ struct cmd cmdtab[] = { { "status", statushelp, 0, 0, status }, { "setstatus", setstatushelp, PR|M, setstatus_gi, setstatus_q }, { "stop", stophelp, PR, 0, stop_q }, - { "tclean", tcleanhelp, 0, init_tclean, clean_q }, + { "tclean", tcleanhelp, 0, tclean_gi, clean_q }, { "topq", topqhelp, PR, topq, 0 }, { "up", uphelp, PR, 0, up_q }, { "?", helphelp, 0, help, 0 }, diff --git a/usr.sbin/lpr/lpc/extern.h b/usr.sbin/lpr/lpc/extern.h index ac79e3180203..9ac011eb0262 100644 --- a/usr.sbin/lpr/lpc/extern.h +++ b/usr.sbin/lpr/lpc/extern.h @@ -43,6 +43,7 @@ __BEGIN_DECLS void abort_q(struct printer *_pp); +void clean_gi(int _argc, char *_argv[]); void clean_q(struct printer *_pp); void disable_q(struct printer *_pp); void down_gi(int _argc, char *_argv[]); @@ -52,8 +53,6 @@ void generic(void (*_specificrtn)(struct printer *_pp), int _cmdopts, void (*_initcmd)(int _argc, char *_argv[]), int _argc, char *_argv[]); void help(int _argc, char *_argv[]); -void init_clean(int _argc, char *_argv[]); -void init_tclean(int _argc, char *_argv[]); void quit(int _argc, char *_argv[]); void restart_q(struct printer *_pp); void setstatus_gi(int _argc, char *_argv[]); @@ -61,6 +60,7 @@ void setstatus_q(struct printer *_pp); void start_q(struct printer *_pp); void status(struct printer *_pp); void stop_q(struct printer *_pp); +void tclean_gi(int _argc, char *_argv[]); void topq(int _argc, char *_argv[]); void up_q(struct printer *_pp); void disable(struct printer *_pp); /* X-version */ |