06afb7022f6… — Fossil SCM

M src/add.c

+1 -1

		--- src/add.c
		+++ src/add.c
		@@ -150,11 +150,11 @@
150	150	**
151	151	** Usage: %fossil test-reserved-names [-omitrepo]
152	152	**
153	153	** Show all reserved filenames for the current check-out.
154	154	*/
155		-void test_reserved_names(void){
	155	+void test_reserved_names_cmd(void){
156	156	int i;
157	157	const char *z;
158	158	int omitRepo = find_option("omitrepo",0,0)!=0;
159	159
160	160	/* We should be done with options.. */
161	161

	--- src/add.c
	+++ src/add.c
	@@ -150,11 +150,11 @@
150	**
151	** Usage: %fossil test-reserved-names [-omitrepo]
152	**
153	** Show all reserved filenames for the current check-out.
154	*/
155	void test_reserved_names(void){
156	int i;
157	const char *z;
158	int omitRepo = find_option("omitrepo",0,0)!=0;
159
160	/* We should be done with options.. */
161

	--- src/add.c
	+++ src/add.c
	@@ -150,11 +150,11 @@
150	**
151	** Usage: %fossil test-reserved-names [-omitrepo]
152	**
153	** Show all reserved filenames for the current check-out.
154	*/
155	void test_reserved_names_cmd(void){
156	int i;
157	const char *z;
158	int omitRepo = find_option("omitrepo",0,0)!=0;
159
160	/* We should be done with options.. */
161

M src/alerts.c

+10 -10

		--- src/alerts.c
		+++ src/alerts.c
		@@ -19,11 +19,11 @@
19	19	**
20	20	** Are you looking for the code that reads and writes the internet
21	21	** email protocol? That is not here. See the "smtp.c" file instead.
22	22	** Yes, the choice of source code filenames is not the greatest, but
23	23	** it is not so bad that changing them seems justified.
24		-*/
	24	+*/
25	25	#include "config.h"
26	26	#include "alerts.h"
27	27	#include <assert.h>
28	28	#include <time.h>
29	29
		@@ -199,11 +199,11 @@
199	199	** WEBPAGE: setup_notification
200	200	**
201	201	** Administrative page for configuring and controlling email notification.
202	202	** Normally accessible via the /Admin/Notification menu.
203	203	*/
204		-void setup_notification(void){
	204	+void setup_notification_page(void){
205	205	static const char *const azSendMethods[] = {
206	206	"off", "Disabled",
207	207	"pipe", "Pipe to a command",
208	208	"db", "Store in a database",
209	209	"dir", "Store in a directory",
		@@ -746,11 +746,11 @@
746	746	**
747	747	** Return the mailbox hash name corresponding to each human-readable
748	748	** name on the command line. This is a test interface for the
749	749	** alert_mailbox_name() function.
750	750	*/
751		-void alert_test_mailbox_hashname(void){
	751	+void test_mailbox_hashname_cmd(void){
752	752	int i;
753	753	for(i=2; i<g.argc; i++){
754	754	fossil_print("%30s: %s\n", g.argv[i], alert_mailbox_name(g.argv[i]));
755	755	}
756	756	}
		@@ -1021,11 +1021,11 @@
1021	1021	** --stdout
1022	1022	** --subject\|-S SUBJECT
1023	1023	**
1024	1024	** unsubscribe EMAIL Remove a single subscriber with the given EMAIL.
1025	1025	*/
1026		-void alert_cmd(void){
	1026	+void alerts_cmd(void){
1027	1027	const char *zCmd;
1028	1028	int nCmd;
1029	1029	db_find_and_open_repository(0, 0);
1030	1030	alert_schema(0);
1031	1031	zCmd = g.argc>=3 ? g.argv[2] : "x";
		@@ -1559,17 +1559,17 @@
1559	1559	** Edit email alert and notification settings.
1560	1560	**
1561	1561	** The subscriber is identified in either of two ways:
1562	1562	**
1563	1563	** (1) The name= query parameter contains the subscriberCode.
1564		-**
	1564	+**
1565	1565	** (2) The user is logged into an account other than "nobody" or
1566	1566	** "anonymous". In that case the notification settings
1567	1567	** associated with that account can be edited without needing
1568	1568	** to know the subscriber code.
1569	1569	*/
1570		-void alert_page(void){
	1570	+void alerts_page(void){
1571	1571	const char *zName = P("name");
1572	1572	Stmt q;
1573	1573	int sa, sc, sf, st, sw, sx;
1574	1574	int sdigest = 0, sdonotcall = 0, sverified = 0;
1575	1575	int isLogin; /* Logged in as an individual */
		@@ -1976,11 +1976,11 @@
1976	1976	** shows a list of subscriber email addresses.
1977	1977	** Clicking on an email takes one to the /alerts page
1978	1978	** for that email where the delivery settings can be
1979	1979	** modified.
1980	1980	*/
1981		-void subscriber_list_page(void){
	1981	+void subscribers_page(void){
1982	1982	Blob sql;
1983	1983	Stmt q;
1984	1984	sqlite3_int64 iNow;
1985	1985	int nTotal;
1986	1986	int nPending;
		@@ -2299,11 +2299,11 @@
2299	2299	blob_appendf(pOut, "\n-- \nTo unsubscribe: %s/unsubscribe\n",
2300	2300	db_get("email-url","http://localhost:8080"));
2301	2301	}
2302	2302
2303	2303	/*
2304		-** COMMAND: test-alert
	2304	+** COMMAND: test-alert
2305	2305	**
2306	2306	** Usage: %fossil test-alert EVENTID ...
2307	2307	**
2308	2308	** Generate the text of an email alert for all of the EVENTIDs
2309	2309	** listed on the command-line. Or if no events are listed on the
		@@ -2360,11 +2360,11 @@
2360	2360	blob_reset(&out);
2361	2361	db_end_transaction(0);
2362	2362	}
2363	2363
2364	2364	/*
2365		-** COMMAND: test-add-alerts
	2365	+** COMMAND: test-add-alerts
2366	2366	**
2367	2367	** Usage: %fossil test-add-alerts [OPTIONS] EVENTID ...
2368	2368	**
2369	2369	** Add one or more events to the pending_alert queue. Use this
2370	2370	** command during testing to force email notifications for specific
		@@ -2385,11 +2385,11 @@
2385	2385	** so that emails are printed to standard output
2386	2386	** rather than being sent.
2387	2387	**
2388	2388	** --digest Process emails using SENDALERT_DIGEST
2389	2389	*/
2390		-void test_add_alert_cmd(void){
	2390	+void test_add_alerts_cmd(void){
2391	2391	int i;
2392	2392	int doAuto = find_option("backoffice",0,0)!=0;
2393	2393	unsigned mFlags = 0;
2394	2394	if( find_option("debug",0,0)!=0 ){
2395	2395	doAuto = 1;
2396	2396

	--- src/alerts.c
	+++ src/alerts.c
	@@ -19,11 +19,11 @@
19	**
20	** Are you looking for the code that reads and writes the internet
21	** email protocol? That is not here. See the "smtp.c" file instead.
22	** Yes, the choice of source code filenames is not the greatest, but
23	** it is not so bad that changing them seems justified.
24	*/
25	#include "config.h"
26	#include "alerts.h"
27	#include <assert.h>
28	#include <time.h>
29
	@@ -199,11 +199,11 @@
199	** WEBPAGE: setup_notification
200	**
201	** Administrative page for configuring and controlling email notification.
202	** Normally accessible via the /Admin/Notification menu.
203	*/
204	void setup_notification(void){
205	static const char *const azSendMethods[] = {
206	"off", "Disabled",
207	"pipe", "Pipe to a command",
208	"db", "Store in a database",
209	"dir", "Store in a directory",
	@@ -746,11 +746,11 @@
746	**
747	** Return the mailbox hash name corresponding to each human-readable
748	** name on the command line. This is a test interface for the
749	** alert_mailbox_name() function.
750	*/
751	void alert_test_mailbox_hashname(void){
752	int i;
753	for(i=2; i<g.argc; i++){
754	fossil_print("%30s: %s\n", g.argv[i], alert_mailbox_name(g.argv[i]));
755	}
756	}
	@@ -1021,11 +1021,11 @@
1021	** --stdout
1022	** --subject\|-S SUBJECT
1023	**
1024	** unsubscribe EMAIL Remove a single subscriber with the given EMAIL.
1025	*/
1026	void alert_cmd(void){
1027	const char *zCmd;
1028	int nCmd;
1029	db_find_and_open_repository(0, 0);
1030	alert_schema(0);
1031	zCmd = g.argc>=3 ? g.argv[2] : "x";
	@@ -1559,17 +1559,17 @@
1559	** Edit email alert and notification settings.
1560	**
1561	** The subscriber is identified in either of two ways:
1562	**
1563	** (1) The name= query parameter contains the subscriberCode.
1564	**
1565	** (2) The user is logged into an account other than "nobody" or
1566	** "anonymous". In that case the notification settings
1567	** associated with that account can be edited without needing
1568	** to know the subscriber code.
1569	*/
1570	void alert_page(void){
1571	const char *zName = P("name");
1572	Stmt q;
1573	int sa, sc, sf, st, sw, sx;
1574	int sdigest = 0, sdonotcall = 0, sverified = 0;
1575	int isLogin; /* Logged in as an individual */
	@@ -1976,11 +1976,11 @@
1976	** shows a list of subscriber email addresses.
1977	** Clicking on an email takes one to the /alerts page
1978	** for that email where the delivery settings can be
1979	** modified.
1980	*/
1981	void subscriber_list_page(void){
1982	Blob sql;
1983	Stmt q;
1984	sqlite3_int64 iNow;
1985	int nTotal;
1986	int nPending;
	@@ -2299,11 +2299,11 @@
2299	blob_appendf(pOut, "\n-- \nTo unsubscribe: %s/unsubscribe\n",
2300	db_get("email-url","http://localhost:8080"));
2301	}
2302
2303	/*
2304	** COMMAND: test-alert
2305	**
2306	** Usage: %fossil test-alert EVENTID ...
2307	**
2308	** Generate the text of an email alert for all of the EVENTIDs
2309	** listed on the command-line. Or if no events are listed on the
	@@ -2360,11 +2360,11 @@
2360	blob_reset(&out);
2361	db_end_transaction(0);
2362	}
2363
2364	/*
2365	** COMMAND: test-add-alerts
2366	**
2367	** Usage: %fossil test-add-alerts [OPTIONS] EVENTID ...
2368	**
2369	** Add one or more events to the pending_alert queue. Use this
2370	** command during testing to force email notifications for specific
	@@ -2385,11 +2385,11 @@
2385	** so that emails are printed to standard output
2386	** rather than being sent.
2387	**
2388	** --digest Process emails using SENDALERT_DIGEST
2389	*/
2390	void test_add_alert_cmd(void){
2391	int i;
2392	int doAuto = find_option("backoffice",0,0)!=0;
2393	unsigned mFlags = 0;
2394	if( find_option("debug",0,0)!=0 ){
2395	doAuto = 1;
2396

	--- src/alerts.c
	+++ src/alerts.c
	@@ -19,11 +19,11 @@
19	**
20	** Are you looking for the code that reads and writes the internet
21	** email protocol? That is not here. See the "smtp.c" file instead.
22	** Yes, the choice of source code filenames is not the greatest, but
23	** it is not so bad that changing them seems justified.
24	*/
25	#include "config.h"
26	#include "alerts.h"
27	#include <assert.h>
28	#include <time.h>
29
	@@ -199,11 +199,11 @@
199	** WEBPAGE: setup_notification
200	**
201	** Administrative page for configuring and controlling email notification.
202	** Normally accessible via the /Admin/Notification menu.
203	*/
204	void setup_notification_page(void){
205	static const char *const azSendMethods[] = {
206	"off", "Disabled",
207	"pipe", "Pipe to a command",
208	"db", "Store in a database",
209	"dir", "Store in a directory",
	@@ -746,11 +746,11 @@
746	**
747	** Return the mailbox hash name corresponding to each human-readable
748	** name on the command line. This is a test interface for the
749	** alert_mailbox_name() function.
750	*/
751	void test_mailbox_hashname_cmd(void){
752	int i;
753	for(i=2; i<g.argc; i++){
754	fossil_print("%30s: %s\n", g.argv[i], alert_mailbox_name(g.argv[i]));
755	}
756	}
	@@ -1021,11 +1021,11 @@
1021	** --stdout
1022	** --subject\|-S SUBJECT
1023	**
1024	** unsubscribe EMAIL Remove a single subscriber with the given EMAIL.
1025	*/
1026	void alerts_cmd(void){
1027	const char *zCmd;
1028	int nCmd;
1029	db_find_and_open_repository(0, 0);
1030	alert_schema(0);
1031	zCmd = g.argc>=3 ? g.argv[2] : "x";
	@@ -1559,17 +1559,17 @@
1559	** Edit email alert and notification settings.
1560	**
1561	** The subscriber is identified in either of two ways:
1562	**
1563	** (1) The name= query parameter contains the subscriberCode.
1564	**
1565	** (2) The user is logged into an account other than "nobody" or
1566	** "anonymous". In that case the notification settings
1567	** associated with that account can be edited without needing
1568	** to know the subscriber code.
1569	*/
1570	void alerts_page(void){
1571	const char *zName = P("name");
1572	Stmt q;
1573	int sa, sc, sf, st, sw, sx;
1574	int sdigest = 0, sdonotcall = 0, sverified = 0;
1575	int isLogin; /* Logged in as an individual */
	@@ -1976,11 +1976,11 @@
1976	** shows a list of subscriber email addresses.
1977	** Clicking on an email takes one to the /alerts page
1978	** for that email where the delivery settings can be
1979	** modified.
1980	*/
1981	void subscribers_page(void){
1982	Blob sql;
1983	Stmt q;
1984	sqlite3_int64 iNow;
1985	int nTotal;
1986	int nPending;
	@@ -2299,11 +2299,11 @@
2299	blob_appendf(pOut, "\n-- \nTo unsubscribe: %s/unsubscribe\n",
2300	db_get("email-url","http://localhost:8080"));
2301	}
2302
2303	/*
2304	** COMMAND: test-alert
2305	**
2306	** Usage: %fossil test-alert EVENTID ...
2307	**
2308	** Generate the text of an email alert for all of the EVENTIDs
2309	** listed on the command-line. Or if no events are listed on the
	@@ -2360,11 +2360,11 @@
2360	blob_reset(&out);
2361	db_end_transaction(0);
2362	}
2363
2364	/*
2365	** COMMAND: test-add-alerts
2366	**
2367	** Usage: %fossil test-add-alerts [OPTIONS] EVENTID ...
2368	**
2369	** Add one or more events to the pending_alert queue. Use this
2370	** command during testing to force email notifications for specific
	@@ -2385,11 +2385,11 @@
2385	** so that emails are printed to standard output
2386	** rather than being sent.
2387	**
2388	** --digest Process emails using SENDALERT_DIGEST
2389	*/
2390	void test_add_alerts_cmd(void){
2391	int i;
2392	int doAuto = find_option("backoffice",0,0)!=0;
2393	unsigned mFlags = 0;
2394	if( find_option("debug",0,0)!=0 ){
2395	doAuto = 1;
2396

M src/allrepo.c

+1 -1

		--- src/allrepo.c
		+++ src/allrepo.c
		@@ -196,11 +196,11 @@
196	196	zCmd = g.argv[2];
197	197	if( !login_is_nobody() ) blob_appendf(&extra, " -U %s", g.zLogin);
198	198	if( strncmp(zCmd, "ui", n)==0 \|\| strncmp(zCmd, "server", n)==0 ){
199	199	g.argv[1] = g.argv[2];
200	200	g.argv[2] = "/";
201		- cmd_webserver();
	201	+ webserver_cmd();
202	202	return;
203	203	}
204	204	if( strncmp(zCmd, "list", n)==0 \|\| strncmp(zCmd,"ls",n)==0 ){
205	205	zCmd = "list";
206	206	useCheckouts = find_option("ckout","c",0)!=0;
207	207

	--- src/allrepo.c
	+++ src/allrepo.c
	@@ -196,11 +196,11 @@
196	zCmd = g.argv[2];
197	if( !login_is_nobody() ) blob_appendf(&extra, " -U %s", g.zLogin);
198	if( strncmp(zCmd, "ui", n)==0 \|\| strncmp(zCmd, "server", n)==0 ){
199	g.argv[1] = g.argv[2];
200	g.argv[2] = "/";
201	cmd_webserver();
202	return;
203	}
204	if( strncmp(zCmd, "list", n)==0 \|\| strncmp(zCmd,"ls",n)==0 ){
205	zCmd = "list";
206	useCheckouts = find_option("ckout","c",0)!=0;
207

	--- src/allrepo.c
	+++ src/allrepo.c
	@@ -196,11 +196,11 @@
196	zCmd = g.argv[2];
197	if( !login_is_nobody() ) blob_appendf(&extra, " -U %s", g.zLogin);
198	if( strncmp(zCmd, "ui", n)==0 \|\| strncmp(zCmd, "server", n)==0 ){
199	g.argv[1] = g.argv[2];
200	g.argv[2] = "/";
201	webserver_cmd();
202	return;
203	}
204	if( strncmp(zCmd, "list", n)==0 \|\| strncmp(zCmd,"ls",n)==0 ){
205	zCmd = "list";
206	useCheckouts = find_option("ckout","c",0)!=0;
207

M src/attach.c

+1 -1

		--- src/attach.c
		+++ src/attach.c
		@@ -147,13 +147,13 @@
147	147	style_footer();
148	148	return;
149	149	}
150	150
151	151	/*
	152	+** WEBPAGE: attachview
152	153	** WEBPAGE: attachdownload
153	154	** WEBPAGE: attachimage
154		-** WEBPAGE: attachview
155	155	**
156	156	** Download or display an attachment.
157	157	** Query parameters:
158	158	**
159	159	** tkt=TICKETUUID
160	160

	--- src/attach.c
	+++ src/attach.c
	@@ -147,13 +147,13 @@
147	style_footer();
148	return;
149	}
150
151	/*

152	** WEBPAGE: attachdownload
153	** WEBPAGE: attachimage
154	** WEBPAGE: attachview
155	**
156	** Download or display an attachment.
157	** Query parameters:
158	**
159	** tkt=TICKETUUID
160

	--- src/attach.c
	+++ src/attach.c
	@@ -147,13 +147,13 @@
147	style_footer();
148	return;
149	}
150
151	/*
152	** WEBPAGE: attachview
153	** WEBPAGE: attachdownload
154	** WEBPAGE: attachimage

155	**
156	** Download or display an attachment.
157	** Query parameters:
158	**
159	** tkt=TICKETUUID
160

M src/backoffice.c

+3 -3

		--- src/backoffice.c
		+++ src/backoffice.c
		@@ -316,11 +316,11 @@
316	316	**
317	317	** Show the current process id, and also tell whether or not all other
318	318	** processes IDs on the command line are running or not. If the --sleep N
319	319	** option is provide, then sleep for N seconds before exiting.
320	320	*/
321		-void test_process_id_command(void){
	321	+void test_process_id_cmd(void){
322	322	const char *zSleep = find_option("sleep",0,1);
323	323	int i;
324	324	verify_all_options();
325	325	fossil_print("ProcessID for this process: %lld\n", backofficeProcessId());
326	326	if( zSleep ) sqlite3_sleep(1000*atoi(zSleep));
		@@ -338,11 +338,11 @@
338	338	** Usage: %fossil test-backoffice-lease
339	339	**
340	340	** Print out information about the backoffice "lease" entry in the
341	341	** config table that controls whether or not backoffice should run.
342	342	*/
343		-void test_backoffice_lease(void){
	343	+void test_backoffice_lease_cmd(void){
344	344	sqlite3_int64 tmNow = time(0);
345	345	Lease x;
346	346	const char *zLease;
347	347	db_find_and_open_repository(0,0);
348	348	verify_all_options();
		@@ -567,11 +567,11 @@
567	567	** change in appoximately N-second intervals.
568	568	** N less than 1 turns polling off (the default).
569	569	**
570	570	** --trace Enable debugging output on stderr
571	571	*/
572		-void backoffice_command(void){
	572	+void backoffice_cmd(void){
573	573	int nPoll;
574	574	const char *zPoll;
575	575	int bDebug = 0;
576	576	unsigned int nCmd = 0;
577	577	if( find_option("trace",0,0)!=0 ) g.fAnyTrace = 1;
578	578

	--- src/backoffice.c
	+++ src/backoffice.c
	@@ -316,11 +316,11 @@
316	**
317	** Show the current process id, and also tell whether or not all other
318	** processes IDs on the command line are running or not. If the --sleep N
319	** option is provide, then sleep for N seconds before exiting.
320	*/
321	void test_process_id_command(void){
322	const char *zSleep = find_option("sleep",0,1);
323	int i;
324	verify_all_options();
325	fossil_print("ProcessID for this process: %lld\n", backofficeProcessId());
326	if( zSleep ) sqlite3_sleep(1000*atoi(zSleep));
	@@ -338,11 +338,11 @@
338	** Usage: %fossil test-backoffice-lease
339	**
340	** Print out information about the backoffice "lease" entry in the
341	** config table that controls whether or not backoffice should run.
342	*/
343	void test_backoffice_lease(void){
344	sqlite3_int64 tmNow = time(0);
345	Lease x;
346	const char *zLease;
347	db_find_and_open_repository(0,0);
348	verify_all_options();
	@@ -567,11 +567,11 @@
567	** change in appoximately N-second intervals.
568	** N less than 1 turns polling off (the default).
569	**
570	** --trace Enable debugging output on stderr
571	*/
572	void backoffice_command(void){
573	int nPoll;
574	const char *zPoll;
575	int bDebug = 0;
576	unsigned int nCmd = 0;
577	if( find_option("trace",0,0)!=0 ) g.fAnyTrace = 1;
578

	--- src/backoffice.c
	+++ src/backoffice.c
	@@ -316,11 +316,11 @@
316	**
317	** Show the current process id, and also tell whether or not all other
318	** processes IDs on the command line are running or not. If the --sleep N
319	** option is provide, then sleep for N seconds before exiting.
320	*/
321	void test_process_id_cmd(void){
322	const char *zSleep = find_option("sleep",0,1);
323	int i;
324	verify_all_options();
325	fossil_print("ProcessID for this process: %lld\n", backofficeProcessId());
326	if( zSleep ) sqlite3_sleep(1000*atoi(zSleep));
	@@ -338,11 +338,11 @@
338	** Usage: %fossil test-backoffice-lease
339	**
340	** Print out information about the backoffice "lease" entry in the
341	** config table that controls whether or not backoffice should run.
342	*/
343	void test_backoffice_lease_cmd(void){
344	sqlite3_int64 tmNow = time(0);
345	Lease x;
346	const char *zLease;
347	db_find_and_open_repository(0,0);
348	verify_all_options();
	@@ -567,11 +567,11 @@
567	** change in appoximately N-second intervals.
568	** N less than 1 turns polling off (the default).
569	**
570	** --trace Enable debugging output on stderr
571	*/
572	void backoffice_cmd(void){
573	int nPoll;
574	const char *zPoll;
575	int bDebug = 0;
576	unsigned int nCmd = 0;
577	if( find_option("trace",0,0)!=0 ) g.fAnyTrace = 1;
578

M src/bisect.c

+1 -1

		--- src/bisect.c
		+++ src/bisect.c
		@@ -510,11 +510,11 @@
510	510	newArgv[2] = "--page";
511	511	newArgv[3] = "timeline?bisect";
512	512	newArgv[4] = 0;
513	513	g.argv = newArgv;
514	514	g.argc = 4;
515		- cmd_webserver();
	515	+ webserver_cmd();
516	516	}else if( strncmp(zCmd, "vlist", n)==0
517	517	\|\| strncmp(zCmd, "ls", n)==0
518	518	\|\| strncmp(zCmd, "status", n)==0
519	519	){
520	520	int fAll = find_option("all", "a", 0)!=0;
521	521

	--- src/bisect.c
	+++ src/bisect.c
	@@ -510,11 +510,11 @@
510	newArgv[2] = "--page";
511	newArgv[3] = "timeline?bisect";
512	newArgv[4] = 0;
513	g.argv = newArgv;
514	g.argc = 4;
515	cmd_webserver();
516	}else if( strncmp(zCmd, "vlist", n)==0
517	\|\| strncmp(zCmd, "ls", n)==0
518	\|\| strncmp(zCmd, "status", n)==0
519	){
520	int fAll = find_option("all", "a", 0)!=0;
521

	--- src/bisect.c
	+++ src/bisect.c
	@@ -510,11 +510,11 @@
510	newArgv[2] = "--page";
511	newArgv[3] = "timeline?bisect";
512	newArgv[4] = 0;
513	g.argv = newArgv;
514	g.argc = 4;
515	webserver_cmd();
516	}else if( strncmp(zCmd, "vlist", n)==0
517	\|\| strncmp(zCmd, "ls", n)==0
518	\|\| strncmp(zCmd, "status", n)==0
519	){
520	int fAll = find_option("all", "a", 0)!=0;
521

M src/blob.c

+5 -5

		--- src/blob.c
		+++ src/blob.c
		@@ -130,11 +130,11 @@
130	130	** COMMAND: test-isspace
131	131	**
132	132	** Verify that the fossil_isspace() routine is working correctly by
133	133	** testing it on all possible inputs.
134	134	*/
135		-void isspace_cmd(void){
	135	+void test_isspace_cmd(void){
136	136	int i;
137	137	for(i=0; i<=255; i++){
138	138	if( i==' ' \|\| i=='\n' \|\| i=='\t' \|\| i=='\v'
139	139	\|\| i=='\f' \|\| i=='\r' ){
140	140	assert( fossil_isspace((char)i) );
		@@ -1025,11 +1025,11 @@
1025	1025	**
1026	1026	** Run compression on INPUTFILE and write the result into OUTPUTFILE.
1027	1027	**
1028	1028	** This is used to test and debug the blob_compress() routine.
1029	1029	*/
1030		-void compress_cmd(void){
	1030	+void test_compress_cmd(void){
1031	1031	Blob f;
1032	1032	if( g.argc!=4 ) usage("INPUTFILE OUTPUTFILE");
1033	1033	blob_read_from_file(&f, g.argv[2], ExtFILE);
1034	1034	blob_compress(&f, &f);
1035	1035	blob_write_to_file(&f, g.argv[3]);
		@@ -1084,11 +1084,11 @@
1084	1084	** Read files IN1 and IN2, concatenate the content, compress the
1085	1085	** content, then write results into OUT.
1086	1086	**
1087	1087	** This is used to test and debug the blob_compress2() routine.
1088	1088	*/
1089		-void compress2_cmd(void){
	1089	+void test_compress2_cmd(void){
1090	1090	Blob f1, f2;
1091	1091	if( g.argc!=5 ) usage("INPUTFILE1 INPUTFILE2 OUTPUTFILE");
1092	1092	blob_read_from_file(&f1, g.argv[2], ExtFILE);
1093	1093	blob_read_from_file(&f2, g.argv[3], ExtFILE);
1094	1094	blob_compress2(&f1, &f2, &f1);
		@@ -1136,11 +1136,11 @@
1136	1136	**
1137	1137	** Read the content of file IN, uncompress that content, and write the
1138	1138	** result into OUT. This command is intended for testing of the
1139	1139	** blob_compress() function.
1140	1140	*/
1141		-void uncompress_cmd(void){
	1141	+void test_uncompress_cmd(void){
1142	1142	Blob f;
1143	1143	if( g.argc!=4 ) usage("INPUTFILE OUTPUTFILE");
1144	1144	blob_read_from_file(&f, g.argv[2], ExtFILE);
1145	1145	blob_uncompress(&f, &f);
1146	1146	blob_write_to_file(&f, g.argv[3]);
		@@ -1150,11 +1150,11 @@
1150	1150	** COMMAND: test-cycle-compress
1151	1151	**
1152	1152	** Compress and uncompress each file named on the command line.
1153	1153	** Verify that the original content is recovered.
1154	1154	*/
1155		-void test_cycle_compress(void){
	1155	+void test_cycle_compress_cmd(void){
1156	1156	int i;
1157	1157	Blob b1, b2, b3;
1158	1158	for(i=2; i<g.argc; i++){
1159	1159	blob_read_from_file(&b1, g.argv[i], ExtFILE);
1160	1160	blob_compress(&b1, &b2);
1161	1161

	--- src/blob.c
	+++ src/blob.c
	@@ -130,11 +130,11 @@
130	** COMMAND: test-isspace
131	**
132	** Verify that the fossil_isspace() routine is working correctly by
133	** testing it on all possible inputs.
134	*/
135	void isspace_cmd(void){
136	int i;
137	for(i=0; i<=255; i++){
138	if( i==' ' \|\| i=='\n' \|\| i=='\t' \|\| i=='\v'
139	\|\| i=='\f' \|\| i=='\r' ){
140	assert( fossil_isspace((char)i) );
	@@ -1025,11 +1025,11 @@
1025	**
1026	** Run compression on INPUTFILE and write the result into OUTPUTFILE.
1027	**
1028	** This is used to test and debug the blob_compress() routine.
1029	*/
1030	void compress_cmd(void){
1031	Blob f;
1032	if( g.argc!=4 ) usage("INPUTFILE OUTPUTFILE");
1033	blob_read_from_file(&f, g.argv[2], ExtFILE);
1034	blob_compress(&f, &f);
1035	blob_write_to_file(&f, g.argv[3]);
	@@ -1084,11 +1084,11 @@
1084	** Read files IN1 and IN2, concatenate the content, compress the
1085	** content, then write results into OUT.
1086	**
1087	** This is used to test and debug the blob_compress2() routine.
1088	*/
1089	void compress2_cmd(void){
1090	Blob f1, f2;
1091	if( g.argc!=5 ) usage("INPUTFILE1 INPUTFILE2 OUTPUTFILE");
1092	blob_read_from_file(&f1, g.argv[2], ExtFILE);
1093	blob_read_from_file(&f2, g.argv[3], ExtFILE);
1094	blob_compress2(&f1, &f2, &f1);
	@@ -1136,11 +1136,11 @@
1136	**
1137	** Read the content of file IN, uncompress that content, and write the
1138	** result into OUT. This command is intended for testing of the
1139	** blob_compress() function.
1140	*/
1141	void uncompress_cmd(void){
1142	Blob f;
1143	if( g.argc!=4 ) usage("INPUTFILE OUTPUTFILE");
1144	blob_read_from_file(&f, g.argv[2], ExtFILE);
1145	blob_uncompress(&f, &f);
1146	blob_write_to_file(&f, g.argv[3]);
	@@ -1150,11 +1150,11 @@
1150	** COMMAND: test-cycle-compress
1151	**
1152	** Compress and uncompress each file named on the command line.
1153	** Verify that the original content is recovered.
1154	*/
1155	void test_cycle_compress(void){
1156	int i;
1157	Blob b1, b2, b3;
1158	for(i=2; i<g.argc; i++){
1159	blob_read_from_file(&b1, g.argv[i], ExtFILE);
1160	blob_compress(&b1, &b2);
1161

	--- src/blob.c
	+++ src/blob.c
	@@ -130,11 +130,11 @@
130	** COMMAND: test-isspace
131	**
132	** Verify that the fossil_isspace() routine is working correctly by
133	** testing it on all possible inputs.
134	*/
135	void test_isspace_cmd(void){
136	int i;
137	for(i=0; i<=255; i++){
138	if( i==' ' \|\| i=='\n' \|\| i=='\t' \|\| i=='\v'
139	\|\| i=='\f' \|\| i=='\r' ){
140	assert( fossil_isspace((char)i) );
	@@ -1025,11 +1025,11 @@
1025	**
1026	** Run compression on INPUTFILE and write the result into OUTPUTFILE.
1027	**
1028	** This is used to test and debug the blob_compress() routine.
1029	*/
1030	void test_compress_cmd(void){
1031	Blob f;
1032	if( g.argc!=4 ) usage("INPUTFILE OUTPUTFILE");
1033	blob_read_from_file(&f, g.argv[2], ExtFILE);
1034	blob_compress(&f, &f);
1035	blob_write_to_file(&f, g.argv[3]);
	@@ -1084,11 +1084,11 @@
1084	** Read files IN1 and IN2, concatenate the content, compress the
1085	** content, then write results into OUT.
1086	**
1087	** This is used to test and debug the blob_compress2() routine.
1088	*/
1089	void test_compress2_cmd(void){
1090	Blob f1, f2;
1091	if( g.argc!=5 ) usage("INPUTFILE1 INPUTFILE2 OUTPUTFILE");
1092	blob_read_from_file(&f1, g.argv[2], ExtFILE);
1093	blob_read_from_file(&f2, g.argv[3], ExtFILE);
1094	blob_compress2(&f1, &f2, &f1);
	@@ -1136,11 +1136,11 @@
1136	**
1137	** Read the content of file IN, uncompress that content, and write the
1138	** result into OUT. This command is intended for testing of the
1139	** blob_compress() function.
1140	*/
1141	void test_uncompress_cmd(void){
1142	Blob f;
1143	if( g.argc!=4 ) usage("INPUTFILE OUTPUTFILE");
1144	blob_read_from_file(&f, g.argv[2], ExtFILE);
1145	blob_uncompress(&f, &f);
1146	blob_write_to_file(&f, g.argv[3]);
	@@ -1150,11 +1150,11 @@
1150	** COMMAND: test-cycle-compress
1151	**
1152	** Compress and uncompress each file named on the command line.
1153	** Verify that the original content is recovered.
1154	*/
1155	void test_cycle_compress_cmd(void){
1156	int i;
1157	Blob b1, b2, b3;
1158	for(i=2; i<g.argc; i++){
1159	blob_read_from_file(&b1, g.argv[i], ExtFILE);
1160	blob_compress(&b1, &b2);
1161

M src/browse.c

+4 -4

		--- src/browse.c
		+++ src/browse.c
		@@ -118,11 +118,11 @@
118	118	** ci=LABEL Show only files in this check-in. Optional.
119	119	** type=TYPE TYPE=flat: use this display
120	120	** TYPE=tree: use the /tree display instead
121	121	** noreadme Do not attempt to display the README file.
122	122	*/
123		-void page_dir(void){
	123	+void dir_page(void){
124	124	char *zD = fossil_strdup(P("name"));
125	125	int nD = zD ? strlen(zD)+1 : 0;
126	126	int mxLen;
127	127	char *zPrefix;
128	128	Stmt q;
		@@ -134,11 +134,11 @@
134	134	const char *zSubdirLink;
135	135	int linkTrunk = 1;
136	136	int linkTip = 1;
137	137	HQuery sURI;
138	138
139		- if( strcmp(PD("type","flat"),"tree")==0 ){ page_tree(); return; }
	139	+ if( strcmp(PD("type","flat"),"tree")==0 ){ tree_page(); return; }
140	140	login_check_credentials();
141	141	if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
142	142	while( nD>1 && zD[nD-2]=='/' ){ zD[(--nD)-1] = 0; }
143	143	style_header("File List");
144	144	style_adunit_config(ADUNIT_RIGHT_OK);
		@@ -587,11 +587,11 @@
587	587	** re=REGEXP Show only files matching REGEXP. Optional.
588	588	** expand Begin with the tree fully expanded.
589	589	** nofiles Show directories (folders) only. Omit files.
590	590	** mtime Order directory elements by decreasing mtime
591	591	*/
592		-void page_tree(void){
	592	+void tree_page(void){
593	593	char *zD = fossil_strdup(P("name"));
594	594	int nD = zD ? strlen(zD)+1 : 0;
595	595	const char *zCI = P("ci");
596	596	int rid = 0;
597	597	char *zUuid = 0;
		@@ -613,11 +613,11 @@
613	613	int startExpanded; /* True to start out with the tree expanded */
614	614	int showDirOnly; /* Show directories only. Omit files */
615	615	int nDir = 0; /* Number of directories. Used for ID attributes */
616	616	char *zProjectName = db_get("project-name", 0);
617	617
618		- if( strcmp(PD("type","flat"),"flat")==0 ){ page_dir(); return; }
	618	+ if( strcmp(PD("type","flat"),"flat")==0 ){ dir_page(); return; }
619	619	memset(&sTree, 0, sizeof(sTree));
620	620	login_check_credentials();
621	621	if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
622	622	while( nD>1 && zD[nD-2]=='/' ){ zD[(--nD)-1] = 0; }
623	623	sqlite3_create_function(g.db, "pathelement", 2, SQLITE_UTF8, 0,
624	624

	--- src/browse.c
	+++ src/browse.c
	@@ -118,11 +118,11 @@
118	** ci=LABEL Show only files in this check-in. Optional.
119	** type=TYPE TYPE=flat: use this display
120	** TYPE=tree: use the /tree display instead
121	** noreadme Do not attempt to display the README file.
122	*/
123	void page_dir(void){
124	char *zD = fossil_strdup(P("name"));
125	int nD = zD ? strlen(zD)+1 : 0;
126	int mxLen;
127	char *zPrefix;
128	Stmt q;
	@@ -134,11 +134,11 @@
134	const char *zSubdirLink;
135	int linkTrunk = 1;
136	int linkTip = 1;
137	HQuery sURI;
138
139	if( strcmp(PD("type","flat"),"tree")==0 ){ page_tree(); return; }
140	login_check_credentials();
141	if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
142	while( nD>1 && zD[nD-2]=='/' ){ zD[(--nD)-1] = 0; }
143	style_header("File List");
144	style_adunit_config(ADUNIT_RIGHT_OK);
	@@ -587,11 +587,11 @@
587	** re=REGEXP Show only files matching REGEXP. Optional.
588	** expand Begin with the tree fully expanded.
589	** nofiles Show directories (folders) only. Omit files.
590	** mtime Order directory elements by decreasing mtime
591	*/
592	void page_tree(void){
593	char *zD = fossil_strdup(P("name"));
594	int nD = zD ? strlen(zD)+1 : 0;
595	const char *zCI = P("ci");
596	int rid = 0;
597	char *zUuid = 0;
	@@ -613,11 +613,11 @@
613	int startExpanded; /* True to start out with the tree expanded */
614	int showDirOnly; /* Show directories only. Omit files */
615	int nDir = 0; /* Number of directories. Used for ID attributes */
616	char *zProjectName = db_get("project-name", 0);
617
618	if( strcmp(PD("type","flat"),"flat")==0 ){ page_dir(); return; }
619	memset(&sTree, 0, sizeof(sTree));
620	login_check_credentials();
621	if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
622	while( nD>1 && zD[nD-2]=='/' ){ zD[(--nD)-1] = 0; }
623	sqlite3_create_function(g.db, "pathelement", 2, SQLITE_UTF8, 0,
624

	--- src/browse.c
	+++ src/browse.c
	@@ -118,11 +118,11 @@
118	** ci=LABEL Show only files in this check-in. Optional.
119	** type=TYPE TYPE=flat: use this display
120	** TYPE=tree: use the /tree display instead
121	** noreadme Do not attempt to display the README file.
122	*/
123	void dir_page(void){
124	char *zD = fossil_strdup(P("name"));
125	int nD = zD ? strlen(zD)+1 : 0;
126	int mxLen;
127	char *zPrefix;
128	Stmt q;
	@@ -134,11 +134,11 @@
134	const char *zSubdirLink;
135	int linkTrunk = 1;
136	int linkTip = 1;
137	HQuery sURI;
138
139	if( strcmp(PD("type","flat"),"tree")==0 ){ tree_page(); return; }
140	login_check_credentials();
141	if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
142	while( nD>1 && zD[nD-2]=='/' ){ zD[(--nD)-1] = 0; }
143	style_header("File List");
144	style_adunit_config(ADUNIT_RIGHT_OK);
	@@ -587,11 +587,11 @@
587	** re=REGEXP Show only files matching REGEXP. Optional.
588	** expand Begin with the tree fully expanded.
589	** nofiles Show directories (folders) only. Omit files.
590	** mtime Order directory elements by decreasing mtime
591	*/
592	void tree_page(void){
593	char *zD = fossil_strdup(P("name"));
594	int nD = zD ? strlen(zD)+1 : 0;
595	const char *zCI = P("ci");
596	int rid = 0;
597	char *zUuid = 0;
	@@ -613,11 +613,11 @@
613	int startExpanded; /* True to start out with the tree expanded */
614	int showDirOnly; /* Show directories only. Omit files */
615	int nDir = 0; /* Number of directories. Used for ID attributes */
616	char *zProjectName = db_get("project-name", 0);
617
618	if( strcmp(PD("type","flat"),"flat")==0 ){ dir_page(); return; }
619	memset(&sTree, 0, sizeof(sTree));
620	login_check_credentials();
621	if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
622	while( nD>1 && zD[nD-2]=='/' ){ zD[(--nD)-1] = 0; }
623	sqlite3_create_function(g.db, "pathelement", 2, SQLITE_UTF8, 0,
624

M src/builtin.c

+3 -3

		--- src/builtin.c
		+++ src/builtin.c
		@@ -58,11 +58,11 @@
58	58	/*
59	59	** COMMAND: test-builtin-list
60	60	**
61	61	** List the names and sizes of all built-in resources.
62	62	*/
63		-void test_builtin_list(void){
	63	+void test_builtin_list_cmd(void){
64	64	int i;
65	65	for(i=0; i<count(aBuiltinFiles); i++){
66	66	fossil_print("%-30s %6d\n", aBuiltinFiles[i].zName,aBuiltinFiles[i].nByte);
67	67	}
68	68	}
		@@ -70,11 +70,11 @@
70	70	/*
71	71	** WEBPAGE: test-builtin-files
72	72	**
73	73	** Show all built-in text files.
74	74	*/
75		-void test_builtin_list_page(void){
	75	+void test_builtin_files_page(void){
76	76	int i;
77	77	style_header("Built-in Text Files");
78	78	@ <ul>
79	79	for(i=0; i<count(aBuiltinFiles); i++){
80	80	const char *z = aBuiltinFiles[i].zName;
		@@ -87,11 +87,11 @@
87	87	/*
88	88	** COMMAND: test-builtin-get
89	89	**
90	90	** Usage: %fossil test-builtin-get NAME ?OUTPUT-FILE?
91	91	*/
92		-void test_builtin_get(void){
	92	+void test_builtin_get_cmd(void){
93	93	const unsigned char *pData;
94	94	int nByte;
95	95	Blob x;
96	96	if( g.argc!=3 && g.argc!=4 ){
97	97	usage("NAME ?OUTPUT-FILE?");
98	98

	--- src/builtin.c
	+++ src/builtin.c
	@@ -58,11 +58,11 @@
58	/*
59	** COMMAND: test-builtin-list
60	**
61	** List the names and sizes of all built-in resources.
62	*/
63	void test_builtin_list(void){
64	int i;
65	for(i=0; i<count(aBuiltinFiles); i++){
66	fossil_print("%-30s %6d\n", aBuiltinFiles[i].zName,aBuiltinFiles[i].nByte);
67	}
68	}
	@@ -70,11 +70,11 @@
70	/*
71	** WEBPAGE: test-builtin-files
72	**
73	** Show all built-in text files.
74	*/
75	void test_builtin_list_page(void){
76	int i;
77	style_header("Built-in Text Files");
78	@ <ul>
79	for(i=0; i<count(aBuiltinFiles); i++){
80	const char *z = aBuiltinFiles[i].zName;
	@@ -87,11 +87,11 @@
87	/*
88	** COMMAND: test-builtin-get
89	**
90	** Usage: %fossil test-builtin-get NAME ?OUTPUT-FILE?
91	*/
92	void test_builtin_get(void){
93	const unsigned char *pData;
94	int nByte;
95	Blob x;
96	if( g.argc!=3 && g.argc!=4 ){
97	usage("NAME ?OUTPUT-FILE?");
98

	--- src/builtin.c
	+++ src/builtin.c
	@@ -58,11 +58,11 @@
58	/*
59	** COMMAND: test-builtin-list
60	**
61	** List the names and sizes of all built-in resources.
62	*/
63	void test_builtin_list_cmd(void){
64	int i;
65	for(i=0; i<count(aBuiltinFiles); i++){
66	fossil_print("%-30s %6d\n", aBuiltinFiles[i].zName,aBuiltinFiles[i].nByte);
67	}
68	}
	@@ -70,11 +70,11 @@
70	/*
71	** WEBPAGE: test-builtin-files
72	**
73	** Show all built-in text files.
74	*/
75	void test_builtin_files_page(void){
76	int i;
77	style_header("Built-in Text Files");
78	@ <ul>
79	for(i=0; i<count(aBuiltinFiles); i++){
80	const char *z = aBuiltinFiles[i].zName;
	@@ -87,11 +87,11 @@
87	/*
88	** COMMAND: test-builtin-get
89	**
90	** Usage: %fossil test-builtin-get NAME ?OUTPUT-FILE?
91	*/
92	void test_builtin_get_cmd(void){
93	const unsigned char *pData;
94	int nByte;
95	Blob x;
96	if( g.argc!=3 && g.argc!=4 ){
97	usage("NAME ?OUTPUT-FILE?");
98

M src/cache.c

+2 -2

		--- src/cache.c
		+++ src/cache.c
		@@ -346,11 +346,11 @@
346	346	/*
347	347	** WEBPAGE: cachestat
348	348	**
349	349	** Show information about the webpage cache. Requires Setup privilege.
350	350	*/
351		-void cache_page(void){
	351	+void cachestat_page(void){
352	352	sqlite3 *db;
353	353	sqlite3_stmt *pStmt;
354	354	char zBuf[100];
355	355
356	356	login_check_credentials();
		@@ -396,11 +396,11 @@
396	396	**
397	397	** Download a single entry for the cache, identified by KEY.
398	398	** This page is normally a hyperlink from the /cachestat page.
399	399	** Requires Admin privilege.
400	400	*/
401		-void cache_getpage(void){
	401	+void cacheget_page(void){
402	402	const char *zKey;
403	403	Blob content;
404	404
405	405	login_check_credentials();
406	406	if( !g.perm.Setup ){ login_needed(0); return; }
407	407

	--- src/cache.c
	+++ src/cache.c
	@@ -346,11 +346,11 @@
346	/*
347	** WEBPAGE: cachestat
348	**
349	** Show information about the webpage cache. Requires Setup privilege.
350	*/
351	void cache_page(void){
352	sqlite3 *db;
353	sqlite3_stmt *pStmt;
354	char zBuf[100];
355
356	login_check_credentials();
	@@ -396,11 +396,11 @@
396	**
397	** Download a single entry for the cache, identified by KEY.
398	** This page is normally a hyperlink from the /cachestat page.
399	** Requires Admin privilege.
400	*/
401	void cache_getpage(void){
402	const char *zKey;
403	Blob content;
404
405	login_check_credentials();
406	if( !g.perm.Setup ){ login_needed(0); return; }
407

	--- src/cache.c
	+++ src/cache.c
	@@ -346,11 +346,11 @@
346	/*
347	** WEBPAGE: cachestat
348	**
349	** Show information about the webpage cache. Requires Setup privilege.
350	*/
351	void cachestat_page(void){
352	sqlite3 *db;
353	sqlite3_stmt *pStmt;
354	char zBuf[100];
355
356	login_check_credentials();
	@@ -396,11 +396,11 @@
396	**
397	** Download a single entry for the cache, identified by KEY.
398	** This page is normally a hyperlink from the /cachestat page.
399	** Requires Admin privilege.
400	*/
401	void cacheget_page(void){
402	const char *zKey;
403	Blob content;
404
405	login_check_credentials();
406	if( !g.perm.Setup ){ login_needed(0); return; }
407

M src/captcha.c

+6 -6

		--- src/captcha.c
		+++ src/captcha.c
		@@ -417,11 +417,11 @@
417	417	/*
418	418	** COMMAND: test-captcha
419	419	**
420	420	** Render an ASCII-art captcha for numbers given on the command line.
421	421	*/
422		-void test_captcha(void){
	422	+void test_captcha_cmd(void){
423	423	int i;
424	424	unsigned int v;
425	425	char *z;
426	426
427	427	for(i=2; i<g.argc; i++){
		@@ -576,11 +576,11 @@
576	576	** WEBPAGE: test-captcha
577	577	** Test the captcha-generator by rendering the value of the name= query
578	578	** parameter using ascii-art. If name= is omitted, show a random 16-digit
579	579	** hexadecimal number.
580	580	*/
581		-void captcha_test(void){
	581	+void test_captcha_page(void){
582	582	const char *zPw = P("name");
583	583	if( zPw==0 \|\| zPw[0]==0 ){
584	584	u64 x;
585	585	sqlite3_randomness(sizeof(x), &x);
586	586	zPw = mprintf("%016llx", x);
		@@ -675,32 +675,32 @@
675	675	}
676	676	}
677	677	}
678	678
679	679	/*
680		-** WEBPAGE: /captcha-audio
	680	+** WEBPAGE: captcha-audio
681	681	**
682	682	** Return a WAV file that pronounces the digits of the captcha that
683	683	** is determined by the seed given in the name= query parameter.
684	684	*/
685		-void captcha_wav_page(void){
	685	+void captcha_audio_page(void){
686	686	const char *zSeed = P("name");
687	687	const char *zDecode = captcha_decode((unsigned int)atoi(zSeed));
688	688	Blob audio;
689	689	captcha_wav(zDecode, &audio);
690	690	cgi_set_content_type("audio/wav");
691	691	cgi_set_content(&audio);
692	692	}
693	693
694	694	/*
695		-** WEBPAGE: /test-captcha-audio
	695	+** WEBPAGE: test-captcha-audio
696	696	**
697	697	** Return a WAV file that pronounces the hex digits of the name=
698	698	** query parameter.
699	699	*/
700		-void captcha_test_wav_page(void){
	700	+void test_captcha_audio_page(void){
701	701	const char *zSeed = P("name");
702	702	Blob audio;
703	703	captcha_wav(zSeed, &audio);
704	704	cgi_set_content_type("audio/wav");
705	705	cgi_set_content(&audio);
706	706	}
707	707

	--- src/captcha.c
	+++ src/captcha.c
	@@ -417,11 +417,11 @@
417	/*
418	** COMMAND: test-captcha
419	**
420	** Render an ASCII-art captcha for numbers given on the command line.
421	*/
422	void test_captcha(void){
423	int i;
424	unsigned int v;
425	char *z;
426
427	for(i=2; i<g.argc; i++){
	@@ -576,11 +576,11 @@
576	** WEBPAGE: test-captcha
577	** Test the captcha-generator by rendering the value of the name= query
578	** parameter using ascii-art. If name= is omitted, show a random 16-digit
579	** hexadecimal number.
580	*/
581	void captcha_test(void){
582	const char *zPw = P("name");
583	if( zPw==0 \|\| zPw[0]==0 ){
584	u64 x;
585	sqlite3_randomness(sizeof(x), &x);
586	zPw = mprintf("%016llx", x);
	@@ -675,32 +675,32 @@
675	}
676	}
677	}
678
679	/*
680	** WEBPAGE: /captcha-audio
681	**
682	** Return a WAV file that pronounces the digits of the captcha that
683	** is determined by the seed given in the name= query parameter.
684	*/
685	void captcha_wav_page(void){
686	const char *zSeed = P("name");
687	const char *zDecode = captcha_decode((unsigned int)atoi(zSeed));
688	Blob audio;
689	captcha_wav(zDecode, &audio);
690	cgi_set_content_type("audio/wav");
691	cgi_set_content(&audio);
692	}
693
694	/*
695	** WEBPAGE: /test-captcha-audio
696	**
697	** Return a WAV file that pronounces the hex digits of the name=
698	** query parameter.
699	*/
700	void captcha_test_wav_page(void){
701	const char *zSeed = P("name");
702	Blob audio;
703	captcha_wav(zSeed, &audio);
704	cgi_set_content_type("audio/wav");
705	cgi_set_content(&audio);
706	}
707

	--- src/captcha.c
	+++ src/captcha.c
	@@ -417,11 +417,11 @@
417	/*
418	** COMMAND: test-captcha
419	**
420	** Render an ASCII-art captcha for numbers given on the command line.
421	*/
422	void test_captcha_cmd(void){
423	int i;
424	unsigned int v;
425	char *z;
426
427	for(i=2; i<g.argc; i++){
	@@ -576,11 +576,11 @@
576	** WEBPAGE: test-captcha
577	** Test the captcha-generator by rendering the value of the name= query
578	** parameter using ascii-art. If name= is omitted, show a random 16-digit
579	** hexadecimal number.
580	*/
581	void test_captcha_page(void){
582	const char *zPw = P("name");
583	if( zPw==0 \|\| zPw[0]==0 ){
584	u64 x;
585	sqlite3_randomness(sizeof(x), &x);
586	zPw = mprintf("%016llx", x);
	@@ -675,32 +675,32 @@
675	}
676	}
677	}
678
679	/*
680	** WEBPAGE: captcha-audio
681	**
682	** Return a WAV file that pronounces the digits of the captcha that
683	** is determined by the seed given in the name= query parameter.
684	*/
685	void captcha_audio_page(void){
686	const char *zSeed = P("name");
687	const char *zDecode = captcha_decode((unsigned int)atoi(zSeed));
688	Blob audio;
689	captcha_wav(zDecode, &audio);
690	cgi_set_content_type("audio/wav");
691	cgi_set_content(&audio);
692	}
693
694	/*
695	** WEBPAGE: test-captcha-audio
696	**
697	** Return a WAV file that pronounces the hex digits of the name=
698	** query parameter.
699	*/
700	void test_captcha_audio_page(void){
701	const char *zSeed = P("name");
702	Blob audio;
703	captcha_wav(zSeed, &audio);
704	cgi_set_content_type("audio/wav");
705	cgi_set_content(&audio);
706	}
707

M src/checkin.c

+3 -3

		--- src/checkin.c
		+++ src/checkin.c
		@@ -349,12 +349,12 @@
349	349	if( relPathOption ){ relativePaths = 1; }
350	350	return relativePaths;
351	351	}
352	352
353	353	/*
354		-** COMMAND: changes
355	354	** COMMAND: status
	355	+** COMMAND: changes
356	356	**
357	357	** Usage: %fossil changes\|status ?OPTIONS? ?PATHS ...?
358	358	**
359	359	** Report the change status of files in the current checkout. If one or
360	360	** more PATHS are specified, only changes among the named files and
		@@ -1453,11 +1453,11 @@
1453	1453	** Usage: %fossil test-date-format DATE-STRING...
1454	1454	**
1455	1455	** Convert the DATE-STRING into the standard format used in artifacts
1456	1456	** and display the result.
1457	1457	*/
1458		-void test_date_format(void){
	1458	+void test_date_format_cmd(void){
1459	1459	int i;
1460	1460	db_find_and_open_repository(OPEN_ANY_SCHEMA, 0);
1461	1461	for(i=2; i<g.argc; i++){
1462	1462	fossil_print("%s -> %s\n", g.argv[i], date_in_standard_format(g.argv[i]));
1463	1463	}
		@@ -1879,11 +1879,11 @@
1879	1879	** --no-settings Do not consider any glob settings.
1880	1880	** -v\|--verbose Show per-file results for all pre-commit checks.
1881	1881	**
1882	1882	** See also: commit, extras
1883	1883	*/
1884		-void test_commit_warning(void){
	1884	+void test_commit_warning_cmd(void){
1885	1885	int rc = 0;
1886	1886	int noSettings;
1887	1887	int verboseFlag;
1888	1888	Stmt q;
1889	1889	noSettings = find_option("no-settings",0,0)!=0;
1890	1890

	--- src/checkin.c
	+++ src/checkin.c
	@@ -349,12 +349,12 @@
349	if( relPathOption ){ relativePaths = 1; }
350	return relativePaths;
351	}
352
353	/*
354	** COMMAND: changes
355	** COMMAND: status

356	**
357	** Usage: %fossil changes\|status ?OPTIONS? ?PATHS ...?
358	**
359	** Report the change status of files in the current checkout. If one or
360	** more PATHS are specified, only changes among the named files and
	@@ -1453,11 +1453,11 @@
1453	** Usage: %fossil test-date-format DATE-STRING...
1454	**
1455	** Convert the DATE-STRING into the standard format used in artifacts
1456	** and display the result.
1457	*/
1458	void test_date_format(void){
1459	int i;
1460	db_find_and_open_repository(OPEN_ANY_SCHEMA, 0);
1461	for(i=2; i<g.argc; i++){
1462	fossil_print("%s -> %s\n", g.argv[i], date_in_standard_format(g.argv[i]));
1463	}
	@@ -1879,11 +1879,11 @@
1879	** --no-settings Do not consider any glob settings.
1880	** -v\|--verbose Show per-file results for all pre-commit checks.
1881	**
1882	** See also: commit, extras
1883	*/
1884	void test_commit_warning(void){
1885	int rc = 0;
1886	int noSettings;
1887	int verboseFlag;
1888	Stmt q;
1889	noSettings = find_option("no-settings",0,0)!=0;
1890

	--- src/checkin.c
	+++ src/checkin.c
	@@ -349,12 +349,12 @@
349	if( relPathOption ){ relativePaths = 1; }
350	return relativePaths;
351	}
352
353	/*

354	** COMMAND: status
355	** COMMAND: changes
356	**
357	** Usage: %fossil changes\|status ?OPTIONS? ?PATHS ...?
358	**
359	** Report the change status of files in the current checkout. If one or
360	** more PATHS are specified, only changes among the named files and
	@@ -1453,11 +1453,11 @@
1453	** Usage: %fossil test-date-format DATE-STRING...
1454	**
1455	** Convert the DATE-STRING into the standard format used in artifacts
1456	** and display the result.
1457	*/
1458	void test_date_format_cmd(void){
1459	int i;
1460	db_find_and_open_repository(OPEN_ANY_SCHEMA, 0);
1461	for(i=2; i<g.argc; i++){
1462	fossil_print("%s -> %s\n", g.argv[i], date_in_standard_format(g.argv[i]));
1463	}
	@@ -1879,11 +1879,11 @@
1879	** --no-settings Do not consider any glob settings.
1880	** -v\|--verbose Show per-file results for all pre-commit checks.
1881	**
1882	** See also: commit, extras
1883	*/
1884	void test_commit_warning_cmd(void){
1885	int rc = 0;
1886	int noSettings;
1887	int verboseFlag;
1888	Stmt q;
1889	noSettings = find_option("no-settings",0,0)!=0;
1890

M src/comformat.c

+1 -1

		--- src/comformat.c
		+++ src/comformat.c
		@@ -568,11 +568,11 @@
568	568	** --indent Number of spaces to indent (default (-1) is to
569	569	** auto-detect). Zero means no indent.
570	570	** -W\|--width <num> Width of lines (default (-1) is to auto-detect).
571	571	** Zero means no limit.
572	572	*/
573		-void test_comment_format(void){
	573	+void test_comment_format_cmd(void){
574	574	const char *zWidth;
575	575	const char *zIndent;
576	576	const char *zPrefix;
577	577	char *zText;
578	578	char *zOrigText;
579	579

	--- src/comformat.c
	+++ src/comformat.c
	@@ -568,11 +568,11 @@
568	** --indent Number of spaces to indent (default (-1) is to
569	** auto-detect). Zero means no indent.
570	** -W\|--width <num> Width of lines (default (-1) is to auto-detect).
571	** Zero means no limit.
572	*/
573	void test_comment_format(void){
574	const char *zWidth;
575	const char *zIndent;
576	const char *zPrefix;
577	char *zText;
578	char *zOrigText;
579

	--- src/comformat.c
	+++ src/comformat.c
	@@ -568,11 +568,11 @@
568	** --indent Number of spaces to indent (default (-1) is to
569	** auto-detect). Zero means no indent.
570	** -W\|--width <num> Width of lines (default (-1) is to auto-detect).
571	** Zero means no limit.
572	*/
573	void test_comment_format_cmd(void){
574	const char *zWidth;
575	const char *zIndent;
576	const char *zPrefix;
577	char *zText;
578	char *zOrigText;
579

M src/content.c

+4 -4

		--- src/content.c
		+++ src/content.c
		@@ -936,11 +936,11 @@
936	936	** Options:
937	937	**
938	938	** --parse Parse all manifests, wikis, tickets, events, and
939	939	** so forth, reporting any errors found.
940	940	*/
941		-void test_integrity(void){
	941	+void test_integrity_cmd(void){
942	942	Stmt q;
943	943	Blob content;
944	944	int n1 = 0;
945	945	int n2 = 0;
946	946	int nErr = 0;
		@@ -1046,11 +1046,11 @@
1046	1046	/*
1047	1047	** COMMAND: test-orphans
1048	1048	**
1049	1049	** Search the repository for orphaned artifacts.
1050	1050	*/
1051		-void test_orphans(void){
	1051	+void test_orphans_cmd(void){
1052	1052	Stmt q;
1053	1053	int cnt = 0;
1054	1054
1055	1055	db_find_and_open_repository(0, 0);
1056	1056	db_multi_exec(
		@@ -1155,11 +1155,11 @@
1155	1155	** Options:
1156	1156	**
1157	1157	** --notshunned Do not report shunned artifacts
1158	1158	** --quiet Only show output if there are errors
1159	1159	*/
1160		-void test_missing(void){
	1160	+void test_missing_cmd(void){
1161	1161	Stmt q;
1162	1162	Blob content;
1163	1163	int nErr = 0;
1164	1164	int nArtifact = 0;
1165	1165	int i;
		@@ -1227,11 +1227,11 @@
1227	1227	** the metadata.
1228	1228	**
1229	1229	** Note that the arguments are the integer raw RID values from the BLOB table,
1230	1230	** not artifact hashes or labels.
1231	1231	*/
1232		-void test_content_erase(void){
	1232	+void test_content_erase_cmd(void){
1233	1233	int i;
1234	1234	Blob x;
1235	1235	char c;
1236	1236	Stmt q;
1237	1237	prompt_user("This command erases information from the repository and\n"
1238	1238

	--- src/content.c
	+++ src/content.c
	@@ -936,11 +936,11 @@
936	** Options:
937	**
938	** --parse Parse all manifests, wikis, tickets, events, and
939	** so forth, reporting any errors found.
940	*/
941	void test_integrity(void){
942	Stmt q;
943	Blob content;
944	int n1 = 0;
945	int n2 = 0;
946	int nErr = 0;
	@@ -1046,11 +1046,11 @@
1046	/*
1047	** COMMAND: test-orphans
1048	**
1049	** Search the repository for orphaned artifacts.
1050	*/
1051	void test_orphans(void){
1052	Stmt q;
1053	int cnt = 0;
1054
1055	db_find_and_open_repository(0, 0);
1056	db_multi_exec(
	@@ -1155,11 +1155,11 @@
1155	** Options:
1156	**
1157	** --notshunned Do not report shunned artifacts
1158	** --quiet Only show output if there are errors
1159	*/
1160	void test_missing(void){
1161	Stmt q;
1162	Blob content;
1163	int nErr = 0;
1164	int nArtifact = 0;
1165	int i;
	@@ -1227,11 +1227,11 @@
1227	** the metadata.
1228	**
1229	** Note that the arguments are the integer raw RID values from the BLOB table,
1230	** not artifact hashes or labels.
1231	*/
1232	void test_content_erase(void){
1233	int i;
1234	Blob x;
1235	char c;
1236	Stmt q;
1237	prompt_user("This command erases information from the repository and\n"
1238

	--- src/content.c
	+++ src/content.c
	@@ -936,11 +936,11 @@
936	** Options:
937	**
938	** --parse Parse all manifests, wikis, tickets, events, and
939	** so forth, reporting any errors found.
940	*/
941	void test_integrity_cmd(void){
942	Stmt q;
943	Blob content;
944	int n1 = 0;
945	int n2 = 0;
946	int nErr = 0;
	@@ -1046,11 +1046,11 @@
1046	/*
1047	** COMMAND: test-orphans
1048	**
1049	** Search the repository for orphaned artifacts.
1050	*/
1051	void test_orphans_cmd(void){
1052	Stmt q;
1053	int cnt = 0;
1054
1055	db_find_and_open_repository(0, 0);
1056	db_multi_exec(
	@@ -1155,11 +1155,11 @@
1155	** Options:
1156	**
1157	** --notshunned Do not report shunned artifacts
1158	** --quiet Only show output if there are errors
1159	*/
1160	void test_missing_cmd(void){
1161	Stmt q;
1162	Blob content;
1163	int nErr = 0;
1164	int nArtifact = 0;
1165	int i;
	@@ -1227,11 +1227,11 @@
1227	** the metadata.
1228	**
1229	** Note that the arguments are the integer raw RID values from the BLOB table,
1230	** not artifact hashes or labels.
1231	*/
1232	void test_content_erase_cmd(void){
1233	int i;
1234	Blob x;
1235	char c;
1236	Stmt q;
1237	prompt_user("This command erases information from the repository and\n"
1238

M src/cookies.c

+2 -2

		--- src/cookies.c
		+++ src/cookies.c
		@@ -201,16 +201,16 @@
201	201	for(i=0; i<cookies.nParam && strcmp(zPName,cookies.aParam[i].zPName); i++){}
202	202	return i<cookies.nParam ? cookies.aParam[i].zPValue : zDefault;
203	203	}
204	204
205	205	/*
206		-** WEBPAGE: cookies
	206	+** WEBPAGE: cookies
207	207	**
208	208	** Show the current display settings contained in the
209	209	** "fossil_display_settings" cookie.
210	210	*/
211		-void cookie_page(void){
	211	+void cookies_page(void){
212	212	int i;
213	213	if( PB("clear") ){
214	214	cgi_set_cookie(DISPLAY_SETTINGS_COOKIE, "", 0, 1);
215	215	cgi_replace_parameter(DISPLAY_SETTINGS_COOKIE, "");
216	216	}
217	217

	--- src/cookies.c
	+++ src/cookies.c
	@@ -201,16 +201,16 @@
201	for(i=0; i<cookies.nParam && strcmp(zPName,cookies.aParam[i].zPName); i++){}
202	return i<cookies.nParam ? cookies.aParam[i].zPValue : zDefault;
203	}
204
205	/*
206	** WEBPAGE: cookies
207	**
208	** Show the current display settings contained in the
209	** "fossil_display_settings" cookie.
210	*/
211	void cookie_page(void){
212	int i;
213	if( PB("clear") ){
214	cgi_set_cookie(DISPLAY_SETTINGS_COOKIE, "", 0, 1);
215	cgi_replace_parameter(DISPLAY_SETTINGS_COOKIE, "");
216	}
217

	--- src/cookies.c
	+++ src/cookies.c
	@@ -201,16 +201,16 @@
201	for(i=0; i<cookies.nParam && strcmp(zPName,cookies.aParam[i].zPName); i++){}
202	return i<cookies.nParam ? cookies.aParam[i].zPValue : zDefault;
203	}
204
205	/*
206	** WEBPAGE: cookies
207	**
208	** Show the current display settings contained in the
209	** "fossil_display_settings" cookie.
210	*/
211	void cookies_page(void){
212	int i;
213	if( PB("clear") ){
214	cgi_set_cookie(DISPLAY_SETTINGS_COOKIE, "", 0, 1);
215	cgi_replace_parameter(DISPLAY_SETTINGS_COOKIE, "");
216	}
217

M src/db.c

+7 -7

		--- src/db.c
		+++ src/db.c
		@@ -605,11 +605,11 @@
605	605	** COMMAND: test-db-exec-error
606	606	**
607	607	** Invoke the db_exec() interface with an erroneous SQL statement
608	608	** in order to verify the error handling logic.
609	609	*/
610		-void db_test_db_exec_cmd(void){
	610	+void test_db_exec_error_cmd(void){
611	611	Stmt err;
612	612	db_find_and_open_repository(0,0);
613	613	db_prepare(&err, "INSERT INTO repository.config(name) VALUES(NULL);");
614	614	db_exec(&err);
615	615	}
		@@ -1900,11 +1900,11 @@
1900	1900	**
1901	1901	** Change the location of the repository database on a local check-out.
1902	1902	** Use this command to avoid having to close and reopen a checkout
1903	1903	** when relocating the repository database.
1904	1904	*/
1905		-void move_repo_cmd(void){
	1905	+void test_move_repo_cmd(void){
1906	1906	Blob repo;
1907	1907	char *zRepo;
1908	1908	if( g.argc!=3 ){
1909	1909	usage("PATHNAME");
1910	1910	}
		@@ -2950,11 +2950,11 @@
2950	2950	** times (the timestamp of the last checkin which modified
2951	2951	** them).
2952	2952	**
2953	2953	** See also: close
2954	2954	*/
2955		-void cmd_open(void){
	2955	+void open_cmd(void){
2956	2956	int emptyFlag;
2957	2957	int keepFlag;
2958	2958	int forceMissingFlag;
2959	2959	int allowNested;
2960	2960	int allowSymlinks;
		@@ -3733,11 +3733,11 @@
3733	3733	**
3734	3734	** --exact only consider exact name matches.
3735	3735	**
3736	3736	** See also: configuration
3737	3737	*/
3738		-void setting_cmd(void){
	3738	+void settings_cmd(void){
3739	3739	int i;
3740	3740	int globalFlag = find_option("global","g",0)!=0;
3741	3741	int exactFlag = find_option("exact",0,0)!=0;
3742	3742	int unsetFlag = g.argv[1][0]=='u';
3743	3743	int nSetting;
		@@ -3867,11 +3867,11 @@
3867	3867	** of SQLite. There is no big advantage to using WITHOUT ROWID in Fossil.
3868	3868	**
3869	3869	** Options:
3870	3870	** --dryrun \| -n No changes. Just print what would happen.
3871	3871	*/
3872		-void test_without_rowid(void){
	3872	+void test_without_rowid_cmd(void){
3873	3873	int i, j;
3874	3874	Stmt q;
3875	3875	Blob allSql;
3876	3876	int dryRun = find_option("dry-run", "n", 0)!=0;
3877	3877	for(i=2; i<g.argc; i++){
		@@ -3969,11 +3969,11 @@
3969	3969	** Print the names of the various database files:
3970	3970	** (1) The main repository database
3971	3971	** (2) The local checkout database
3972	3972	** (3) The global configuration database
3973	3973	*/
3974		-void test_database_name_cmd(void){
	3974	+void test_database_names_cmd(void){
3975	3975	db_find_and_open_repository(OPEN_ANY_SCHEMA, 0);
3976	3976	fossil_print("Repository database: %s\n", g.zRepositoryName);
3977	3977	fossil_print("Local database: %s\n", g.zLocalDbName);
3978	3978	fossil_print("Config database: %s\n", g.zConfigDbName);
3979	3979	}
		@@ -4048,11 +4048,11 @@
4048	4048	** Display the repository fingerprint using the supplied RCVID or
4049	4049	** using the latest RCVID if not is given on the command line.
4050	4050	** Show both the legacy and the newer version of the fingerprint,
4051	4051	** and the currently stored fingerprint if there is one.
4052	4052	*/
4053		-void test_fingerprint(void){
	4053	+void test_fingerprint_cmd(void){
4054	4054	int rcvid = 0;
4055	4055	db_find_and_open_repository(OPEN_ANY_SCHEMA,0);
4056	4056	if( g.argc==3 ){
4057	4057	rcvid = atoi(g.argv[2]);
4058	4058	}else if( g.argc!=2 ){
4059	4059

	--- src/db.c
	+++ src/db.c
	@@ -605,11 +605,11 @@
605	** COMMAND: test-db-exec-error
606	**
607	** Invoke the db_exec() interface with an erroneous SQL statement
608	** in order to verify the error handling logic.
609	*/
610	void db_test_db_exec_cmd(void){
611	Stmt err;
612	db_find_and_open_repository(0,0);
613	db_prepare(&err, "INSERT INTO repository.config(name) VALUES(NULL);");
614	db_exec(&err);
615	}
	@@ -1900,11 +1900,11 @@
1900	**
1901	** Change the location of the repository database on a local check-out.
1902	** Use this command to avoid having to close and reopen a checkout
1903	** when relocating the repository database.
1904	*/
1905	void move_repo_cmd(void){
1906	Blob repo;
1907	char *zRepo;
1908	if( g.argc!=3 ){
1909	usage("PATHNAME");
1910	}
	@@ -2950,11 +2950,11 @@
2950	** times (the timestamp of the last checkin which modified
2951	** them).
2952	**
2953	** See also: close
2954	*/
2955	void cmd_open(void){
2956	int emptyFlag;
2957	int keepFlag;
2958	int forceMissingFlag;
2959	int allowNested;
2960	int allowSymlinks;
	@@ -3733,11 +3733,11 @@
3733	**
3734	** --exact only consider exact name matches.
3735	**
3736	** See also: configuration
3737	*/
3738	void setting_cmd(void){
3739	int i;
3740	int globalFlag = find_option("global","g",0)!=0;
3741	int exactFlag = find_option("exact",0,0)!=0;
3742	int unsetFlag = g.argv[1][0]=='u';
3743	int nSetting;
	@@ -3867,11 +3867,11 @@
3867	** of SQLite. There is no big advantage to using WITHOUT ROWID in Fossil.
3868	**
3869	** Options:
3870	** --dryrun \| -n No changes. Just print what would happen.
3871	*/
3872	void test_without_rowid(void){
3873	int i, j;
3874	Stmt q;
3875	Blob allSql;
3876	int dryRun = find_option("dry-run", "n", 0)!=0;
3877	for(i=2; i<g.argc; i++){
	@@ -3969,11 +3969,11 @@
3969	** Print the names of the various database files:
3970	** (1) The main repository database
3971	** (2) The local checkout database
3972	** (3) The global configuration database
3973	*/
3974	void test_database_name_cmd(void){
3975	db_find_and_open_repository(OPEN_ANY_SCHEMA, 0);
3976	fossil_print("Repository database: %s\n", g.zRepositoryName);
3977	fossil_print("Local database: %s\n", g.zLocalDbName);
3978	fossil_print("Config database: %s\n", g.zConfigDbName);
3979	}
	@@ -4048,11 +4048,11 @@
4048	** Display the repository fingerprint using the supplied RCVID or
4049	** using the latest RCVID if not is given on the command line.
4050	** Show both the legacy and the newer version of the fingerprint,
4051	** and the currently stored fingerprint if there is one.
4052	*/
4053	void test_fingerprint(void){
4054	int rcvid = 0;
4055	db_find_and_open_repository(OPEN_ANY_SCHEMA,0);
4056	if( g.argc==3 ){
4057	rcvid = atoi(g.argv[2]);
4058	}else if( g.argc!=2 ){
4059

	--- src/db.c
	+++ src/db.c
	@@ -605,11 +605,11 @@
605	** COMMAND: test-db-exec-error
606	**
607	** Invoke the db_exec() interface with an erroneous SQL statement
608	** in order to verify the error handling logic.
609	*/
610	void test_db_exec_error_cmd(void){
611	Stmt err;
612	db_find_and_open_repository(0,0);
613	db_prepare(&err, "INSERT INTO repository.config(name) VALUES(NULL);");
614	db_exec(&err);
615	}
	@@ -1900,11 +1900,11 @@
1900	**
1901	** Change the location of the repository database on a local check-out.
1902	** Use this command to avoid having to close and reopen a checkout
1903	** when relocating the repository database.
1904	*/
1905	void test_move_repo_cmd(void){
1906	Blob repo;
1907	char *zRepo;
1908	if( g.argc!=3 ){
1909	usage("PATHNAME");
1910	}
	@@ -2950,11 +2950,11 @@
2950	** times (the timestamp of the last checkin which modified
2951	** them).
2952	**
2953	** See also: close
2954	*/
2955	void open_cmd(void){
2956	int emptyFlag;
2957	int keepFlag;
2958	int forceMissingFlag;
2959	int allowNested;
2960	int allowSymlinks;
	@@ -3733,11 +3733,11 @@
3733	**
3734	** --exact only consider exact name matches.
3735	**
3736	** See also: configuration
3737	*/
3738	void settings_cmd(void){
3739	int i;
3740	int globalFlag = find_option("global","g",0)!=0;
3741	int exactFlag = find_option("exact",0,0)!=0;
3742	int unsetFlag = g.argv[1][0]=='u';
3743	int nSetting;
	@@ -3867,11 +3867,11 @@
3867	** of SQLite. There is no big advantage to using WITHOUT ROWID in Fossil.
3868	**
3869	** Options:
3870	** --dryrun \| -n No changes. Just print what would happen.
3871	*/
3872	void test_without_rowid_cmd(void){
3873	int i, j;
3874	Stmt q;
3875	Blob allSql;
3876	int dryRun = find_option("dry-run", "n", 0)!=0;
3877	for(i=2; i<g.argc; i++){
	@@ -3969,11 +3969,11 @@
3969	** Print the names of the various database files:
3970	** (1) The main repository database
3971	** (2) The local checkout database
3972	** (3) The global configuration database
3973	*/
3974	void test_database_names_cmd(void){
3975	db_find_and_open_repository(OPEN_ANY_SCHEMA, 0);
3976	fossil_print("Repository database: %s\n", g.zRepositoryName);
3977	fossil_print("Local database: %s\n", g.zLocalDbName);
3978	fossil_print("Config database: %s\n", g.zConfigDbName);
3979	}
	@@ -4048,11 +4048,11 @@
4048	** Display the repository fingerprint using the supplied RCVID or
4049	** using the latest RCVID if not is given on the command line.
4050	** Show both the legacy and the newer version of the fingerprint,
4051	** and the currently stored fingerprint if there is one.
4052	*/
4053	void test_fingerprint_cmd(void){
4054	int rcvid = 0;
4055	db_find_and_open_repository(OPEN_ANY_SCHEMA,0);
4056	if( g.argc==3 ){
4057	rcvid = atoi(g.argv[2]);
4058	}else if( g.argc!=2 ){
4059

M src/deltacmd.c

+4 -4

		--- src/deltacmd.c
		+++ src/deltacmd.c
		@@ -48,11 +48,11 @@
48	48	** Usage: %fossil test-delta-create FILE1 FILE2 DELTA
49	49	**
50	50	** Create and output a delta that carries FILE1 into FILE2.
51	51	** Store the result in DELTA.
52	52	*/
53		-void delta_create_cmd(void){
	53	+void test_delta_create_cmd(void){
54	54	Blob orig, target, delta;
55	55	if( g.argc!=5 ){
56	56	usage("ORIGIN TARGET DELTA");
57	57	}
58	58	if( blob_read_from_file(&orig, g.argv[2], ExtFILE)<0 ){
		@@ -76,11 +76,11 @@
76	76	** Usage: %fossil test-delta-analyze FILE1 FILE2
77	77	**
78	78	** Create and a delta that carries FILE1 into FILE2. Print the
79	79	** number bytes copied and the number of bytes inserted.
80	80	*/
81		-void delta_analyze_cmd(void){
	81	+void test_delta_analyze_cmd(void){
82	82	Blob orig, target, delta;
83	83	int nCopy = 0;
84	84	int nInsert = 0;
85	85	int sz1, sz2, sz3;
86	86	if( g.argc!=4 ){
		@@ -147,11 +147,11 @@
147	147	**
148	148	** Usage: %fossil test-delta-apply FILE1 DELTA
149	149	**
150	150	** Apply DELTA to FILE1 and output the result.
151	151	*/
152		-void delta_apply_cmd(void){
	152	+void test_delta_apply_cmd(void){
153	153	Blob orig, target, delta;
154	154	if( g.argc!=5 ){
155	155	usage("ORIGIN DELTA TARGET");
156	156	}
157	157	if( blob_read_from_file(&orig, g.argv[2], ExtFILE)<0 ){
		@@ -177,11 +177,11 @@
177	177	**
178	178	** Read two files named on the command-line. Create and apply deltas
179	179	** going in both directions. Verify that the original files are
180	180	** correctly recovered.
181	181	*/
182		-void cmd_test_delta(void){
	182	+void test_delta_cmd(void){
183	183	Blob f1, f2; /* Original file content */
184	184	Blob d12, d21; /* Deltas from f1->f2 and f2->f1 */
185	185	Blob a1, a2; /* Recovered file content */
186	186	if( g.argc!=4 ) usage("FILE1 FILE2");
187	187	blob_read_from_file(&f1, g.argv[2], ExtFILE);
188	188

	--- src/deltacmd.c
	+++ src/deltacmd.c
	@@ -48,11 +48,11 @@
48	** Usage: %fossil test-delta-create FILE1 FILE2 DELTA
49	**
50	** Create and output a delta that carries FILE1 into FILE2.
51	** Store the result in DELTA.
52	*/
53	void delta_create_cmd(void){
54	Blob orig, target, delta;
55	if( g.argc!=5 ){
56	usage("ORIGIN TARGET DELTA");
57	}
58	if( blob_read_from_file(&orig, g.argv[2], ExtFILE)<0 ){
	@@ -76,11 +76,11 @@
76	** Usage: %fossil test-delta-analyze FILE1 FILE2
77	**
78	** Create and a delta that carries FILE1 into FILE2. Print the
79	** number bytes copied and the number of bytes inserted.
80	*/
81	void delta_analyze_cmd(void){
82	Blob orig, target, delta;
83	int nCopy = 0;
84	int nInsert = 0;
85	int sz1, sz2, sz3;
86	if( g.argc!=4 ){
	@@ -147,11 +147,11 @@
147	**
148	** Usage: %fossil test-delta-apply FILE1 DELTA
149	**
150	** Apply DELTA to FILE1 and output the result.
151	*/
152	void delta_apply_cmd(void){
153	Blob orig, target, delta;
154	if( g.argc!=5 ){
155	usage("ORIGIN DELTA TARGET");
156	}
157	if( blob_read_from_file(&orig, g.argv[2], ExtFILE)<0 ){
	@@ -177,11 +177,11 @@
177	**
178	** Read two files named on the command-line. Create and apply deltas
179	** going in both directions. Verify that the original files are
180	** correctly recovered.
181	*/
182	void cmd_test_delta(void){
183	Blob f1, f2; /* Original file content */
184	Blob d12, d21; /* Deltas from f1->f2 and f2->f1 */
185	Blob a1, a2; /* Recovered file content */
186	if( g.argc!=4 ) usage("FILE1 FILE2");
187	blob_read_from_file(&f1, g.argv[2], ExtFILE);
188

	--- src/deltacmd.c
	+++ src/deltacmd.c
	@@ -48,11 +48,11 @@
48	** Usage: %fossil test-delta-create FILE1 FILE2 DELTA
49	**
50	** Create and output a delta that carries FILE1 into FILE2.
51	** Store the result in DELTA.
52	*/
53	void test_delta_create_cmd(void){
54	Blob orig, target, delta;
55	if( g.argc!=5 ){
56	usage("ORIGIN TARGET DELTA");
57	}
58	if( blob_read_from_file(&orig, g.argv[2], ExtFILE)<0 ){
	@@ -76,11 +76,11 @@
76	** Usage: %fossil test-delta-analyze FILE1 FILE2
77	**
78	** Create and a delta that carries FILE1 into FILE2. Print the
79	** number bytes copied and the number of bytes inserted.
80	*/
81	void test_delta_analyze_cmd(void){
82	Blob orig, target, delta;
83	int nCopy = 0;
84	int nInsert = 0;
85	int sz1, sz2, sz3;
86	if( g.argc!=4 ){
	@@ -147,11 +147,11 @@
147	**
148	** Usage: %fossil test-delta-apply FILE1 DELTA
149	**
150	** Apply DELTA to FILE1 and output the result.
151	*/
152	void test_delta_apply_cmd(void){
153	Blob orig, target, delta;
154	if( g.argc!=5 ){
155	usage("ORIGIN DELTA TARGET");
156	}
157	if( blob_read_from_file(&orig, g.argv[2], ExtFILE)<0 ){
	@@ -177,11 +177,11 @@
177	**
178	** Read two files named on the command-line. Create and apply deltas
179	** going in both directions. Verify that the original files are
180	** correctly recovered.
181	*/
182	void test_delta_cmd(void){
183	Blob f1, f2; /* Original file content */
184	Blob d12, d21; /* Deltas from f1->f2 and f2->f1 */
185	Blob a1, a2; /* Recovered file content */
186	if( g.argc!=4 ) usage("FILE1 FILE2");
187	blob_read_from_file(&f1, g.argv[2], ExtFILE);
188

M src/diff.c

+1 -1

		--- src/diff.c
		+++ src/diff.c
		@@ -2385,11 +2385,11 @@
2385	2385	** check-in over the entire repository is used.
2386	2386	** Specify "origin=trunk" or similar for a reverse
2387	2387	** annotation
2388	2388	** w=BOOLEAN Ignore whitespace
2389	2389	*/
2390		-void annotation_page(void){
	2390	+void annotate_page(void){
2391	2391	int i;
2392	2392	const char zLimit; / Depth limit */
2393	2393	u64 annFlags = DIFF_STRIP_EOLCR;
2394	2394	int showLog; /* True to display the log */
2395	2395	int fileVers; /* Show file version instead of check-in versions */
2396	2396

	--- src/diff.c
	+++ src/diff.c
	@@ -2385,11 +2385,11 @@
2385	** check-in over the entire repository is used.
2386	** Specify "origin=trunk" or similar for a reverse
2387	** annotation
2388	** w=BOOLEAN Ignore whitespace
2389	*/
2390	void annotation_page(void){
2391	int i;
2392	const char zLimit; / Depth limit */
2393	u64 annFlags = DIFF_STRIP_EOLCR;
2394	int showLog; /* True to display the log */
2395	int fileVers; /* Show file version instead of check-in versions */
2396

	--- src/diff.c
	+++ src/diff.c
	@@ -2385,11 +2385,11 @@
2385	** check-in over the entire repository is used.
2386	** Specify "origin=trunk" or similar for a reverse
2387	** annotation
2388	** w=BOOLEAN Ignore whitespace
2389	*/
2390	void annotate_page(void){
2391	int i;
2392	const char zLimit; / Depth limit */
2393	u64 annFlags = DIFF_STRIP_EOLCR;
2394	int showLog; /* True to display the log */
2395	int fileVers; /* Show file version instead of check-in versions */
2396

M src/dispatch.c

+1 -1

		--- src/dispatch.c
		+++ src/dispatch.c
		@@ -498,11 +498,11 @@
498	498	/*
499	499	** COMMAND: test-list-webpage
500	500	**
501	501	** List all web pages.
502	502	*/
503		-void cmd_test_webpage_list(void){
	503	+void test_list_webpage_cmd(void){
504	504	int i, nCmd;
505	505	const char *aCmd[MX_COMMAND];
506	506	for(i=nCmd=0; i<MX_COMMAND; i++){
507	507	if(CMDFLAG_WEBPAGE & aCommand[i].eCmdFlags){
508	508	aCmd[nCmd++] = aCommand[i].zName;
509	509

	--- src/dispatch.c
	+++ src/dispatch.c
	@@ -498,11 +498,11 @@
498	/*
499	** COMMAND: test-list-webpage
500	**
501	** List all web pages.
502	*/
503	void cmd_test_webpage_list(void){
504	int i, nCmd;
505	const char *aCmd[MX_COMMAND];
506	for(i=nCmd=0; i<MX_COMMAND; i++){
507	if(CMDFLAG_WEBPAGE & aCommand[i].eCmdFlags){
508	aCmd[nCmd++] = aCommand[i].zName;
509

	--- src/dispatch.c
	+++ src/dispatch.c
	@@ -498,11 +498,11 @@
498	/*
499	** COMMAND: test-list-webpage
500	**
501	** List all web pages.
502	*/
503	void test_list_webpage_cmd(void){
504	int i, nCmd;
505	const char *aCmd[MX_COMMAND];
506	for(i=nCmd=0; i<MX_COMMAND; i++){
507	if(CMDFLAG_WEBPAGE & aCommand[i].eCmdFlags){
508	aCmd[nCmd++] = aCommand[i].zName;
509

M src/doc.c

+3 -3

		--- src/doc.c
		+++ src/doc.c
		@@ -459,11 +459,11 @@
459	459	**
460	460	** If Fossil is compiled with -DFOSSIL_DEBUG then the "mimetype-test"
461	461	** filename is special and verifies the integrity of the mimetype table.
462	462	** It should return "ok".
463	463	*/
464		-void mimetype_test_cmd(void){
	464	+void test_mimetype_cmd(void){
465	465	int i;
466	466	mimetype_verify();
467	467	db_find_and_open_repository(0, 0);
468	468	for(i=2; i<g.argc; i++){
469	469	fossil_print("%-20s -> %s\n", g.argv[i], mimetype_from_name(g.argv[i]));
		@@ -804,12 +804,12 @@
804	804	}
805	805	}
806	806
807	807
808	808	/*
809		-** WEBPAGE: uv
810	809	** WEBPAGE: doc
	810	+** WEBPAGE: uv
811	811	** URL: /uv/FILE
812	812	** URL: /doc/CHECKIN/FILE
813	813	**
814	814	** CHECKIN can be either tag or hash prefix or timestamp identifying a
815	815	** particular check, or the name of a branch (meaning the most recent
		@@ -1159,11 +1159,11 @@
1159	1159	**
1160	1160	** Query parameters:
1161	1161	**
1162	1162	** s=PATTERN Search for PATTERN
1163	1163	*/
1164		-void doc_search_page(void){
	1164	+void docsrch_page(void){
1165	1165	login_check_credentials();
1166	1166	style_header("Document Search");
1167	1167	search_screen(SRCH_DOC, 0);
1168	1168	style_footer();
1169	1169	}
1170	1170

	--- src/doc.c
	+++ src/doc.c
	@@ -459,11 +459,11 @@
459	**
460	** If Fossil is compiled with -DFOSSIL_DEBUG then the "mimetype-test"
461	** filename is special and verifies the integrity of the mimetype table.
462	** It should return "ok".
463	*/
464	void mimetype_test_cmd(void){
465	int i;
466	mimetype_verify();
467	db_find_and_open_repository(0, 0);
468	for(i=2; i<g.argc; i++){
469	fossil_print("%-20s -> %s\n", g.argv[i], mimetype_from_name(g.argv[i]));
	@@ -804,12 +804,12 @@
804	}
805	}
806
807
808	/*
809	** WEBPAGE: uv
810	** WEBPAGE: doc

811	** URL: /uv/FILE
812	** URL: /doc/CHECKIN/FILE
813	**
814	** CHECKIN can be either tag or hash prefix or timestamp identifying a
815	** particular check, or the name of a branch (meaning the most recent
	@@ -1159,11 +1159,11 @@
1159	**
1160	** Query parameters:
1161	**
1162	** s=PATTERN Search for PATTERN
1163	*/
1164	void doc_search_page(void){
1165	login_check_credentials();
1166	style_header("Document Search");
1167	search_screen(SRCH_DOC, 0);
1168	style_footer();
1169	}
1170

	--- src/doc.c
	+++ src/doc.c
	@@ -459,11 +459,11 @@
459	**
460	** If Fossil is compiled with -DFOSSIL_DEBUG then the "mimetype-test"
461	** filename is special and verifies the integrity of the mimetype table.
462	** It should return "ok".
463	*/
464	void test_mimetype_cmd(void){
465	int i;
466	mimetype_verify();
467	db_find_and_open_repository(0, 0);
468	for(i=2; i<g.argc; i++){
469	fossil_print("%-20s -> %s\n", g.argv[i], mimetype_from_name(g.argv[i]));
	@@ -804,12 +804,12 @@
804	}
805	}
806
807
808	/*

809	** WEBPAGE: doc
810	** WEBPAGE: uv
811	** URL: /uv/FILE
812	** URL: /doc/CHECKIN/FILE
813	**
814	** CHECKIN can be either tag or hash prefix or timestamp identifying a
815	** particular check, or the name of a branch (meaning the most recent
	@@ -1159,11 +1159,11 @@
1159	**
1160	** Query parameters:
1161	**
1162	** s=PATTERN Search for PATTERN
1163	*/
1164	void docsrch_page(void){
1165	login_check_credentials();
1166	style_header("Document Search");
1167	search_screen(SRCH_DOC, 0);
1168	style_footer();
1169	}
1170

M src/export.c

+2 -2

		--- src/export.c
		+++ src/export.c
		@@ -837,11 +837,11 @@
837	837	** COMMAND: test-topological-sort
838	838	**
839	839	** Invoke the topological_sort_checkins() interface for testing
840	840	** purposes.
841	841	*/
842		-void test_topological_sort(void){
	842	+void test_topological_sort_cmd(void){
843	843	int n;
844	844	db_find_and_open_repository(0, 0);
845	845	n = topological_sort_checkins(1);
846	846	fossil_print("%d reorderings required\n", n);
847	847	}
		@@ -1662,11 +1662,11 @@
1662	1662	**
1663	1663	** fossil git status
1664	1664	**
1665	1665	** Show the status of the current Git mirror, if there is one.
1666	1666	*/
1667		-void gitmirror_command(void){
	1667	+void gitmirror_cmd(void){
1668	1668	char *zCmd;
1669	1669	int nCmd;
1670	1670	if( g.argc<3 ){
1671	1671	usage("export ARGS...");
1672	1672	}
1673	1673

	--- src/export.c
	+++ src/export.c
	@@ -837,11 +837,11 @@
837	** COMMAND: test-topological-sort
838	**
839	** Invoke the topological_sort_checkins() interface for testing
840	** purposes.
841	*/
842	void test_topological_sort(void){
843	int n;
844	db_find_and_open_repository(0, 0);
845	n = topological_sort_checkins(1);
846	fossil_print("%d reorderings required\n", n);
847	}
	@@ -1662,11 +1662,11 @@
1662	**
1663	** fossil git status
1664	**
1665	** Show the status of the current Git mirror, if there is one.
1666	*/
1667	void gitmirror_command(void){
1668	char *zCmd;
1669	int nCmd;
1670	if( g.argc<3 ){
1671	usage("export ARGS...");
1672	}
1673

	--- src/export.c
	+++ src/export.c
	@@ -837,11 +837,11 @@
837	** COMMAND: test-topological-sort
838	**
839	** Invoke the topological_sort_checkins() interface for testing
840	** purposes.
841	*/
842	void test_topological_sort_cmd(void){
843	int n;
844	db_find_and_open_repository(0, 0);
845	n = topological_sort_checkins(1);
846	fossil_print("%d reorderings required\n", n);
847	}
	@@ -1662,11 +1662,11 @@
1662	**
1663	** fossil git status
1664	**
1665	** Show the status of the current Git mirror, if there is one.
1666	*/
1667	void gitmirror_cmd(void){
1668	char *zCmd;
1669	int nCmd;
1670	if( g.argc<3 ){
1671	usage("export ARGS...");
1672	}
1673

M src/extcgi.c

+1 -1

		--- src/extcgi.c
		+++ src/extcgi.c
		@@ -383,11 +383,11 @@
383	383	/*
384	384	** WEBPAGE: extfilelist
385	385	**
386	386	** List all files in the extension CGI document root and its subfolders.
387	387	*/
388		-void ext_filelist_page(void){
	388	+void extfilelist_page(void){
389	389	Stmt q;
390	390	login_check_credentials();
391	391	if( !g.perm.Admin ){
392	392	login_needed(0);
393	393	return;
394	394

	--- src/extcgi.c
	+++ src/extcgi.c
	@@ -383,11 +383,11 @@
383	/*
384	** WEBPAGE: extfilelist
385	**
386	** List all files in the extension CGI document root and its subfolders.
387	*/
388	void ext_filelist_page(void){
389	Stmt q;
390	login_check_credentials();
391	if( !g.perm.Admin ){
392	login_needed(0);
393	return;
394

	--- src/extcgi.c
	+++ src/extcgi.c
	@@ -383,11 +383,11 @@
383	/*
384	** WEBPAGE: extfilelist
385	**
386	** List all files in the extension CGI document root and its subfolders.
387	*/
388	void extfilelist_page(void){
389	Stmt q;
390	login_check_credentials();
391	if( !g.perm.Admin ){
392	login_needed(0);
393	return;
394

M src/file.c

+10 -10

		--- src/file.c
		+++ src/file.c
		@@ -511,11 +511,11 @@
511	511	**
512	512	** Make a copy of the file at SOURCE into a new name DESTINATION. Any
513	513	** directories in the path leading up to DESTINATION that do not already
514	514	** exist are created automatically.
515	515	*/
516		-void test_file_copy(void){
	516	+void test_file_copy_cmd(void){
517	517	if( g.argc!=4 ){
518	518	fossil_fatal("Usage: %s test-file-copy SOURCE DESTINATION", g.argv[0]);
519	519	}
520	520	file_copy(g.argv[2], g.argv[3]);
521	521	}
		@@ -578,11 +578,11 @@
578	578	**
579	579	** Usage: %fossil test-set-mtime FILENAME DATE/TIME
580	580	**
581	581	** Sets the mtime of the named file to the date/time shown.
582	582	*/
583		-void test_set_mtime(void){
	583	+void test_set_mtime_cmd(void){
584	584	const char *zFile;
585	585	char *zDate;
586	586	i64 iMTime;
587	587	if( g.argc!=4 ){
588	588	usage("FILENAME DATE/TIME");
		@@ -734,11 +734,11 @@
734	734	** Usage: %fossil test-is-normal-dir NAME...
735	735	**
736	736	** Returns non-zero if the specified names represent real directories, i.e.
737	737	** not junctions, symbolic links, etc.
738	738	*/
739		-void test_is_normal_dir(void){
	739	+void test_is_normal_dir_cmd(void){
740	740	int i;
741	741	for(i=2; i<g.argc; i++){
742	742	wchar_t *zMbcs = fossil_utf8_to_path(g.argv[i], 1);
743	743	fossil_print("ATTRS \"%s\" -> %lx\n", g.argv[i], GetFileAttributesW(zMbcs));
744	744	fossil_print("ISDIR \"%s\" -> %d\n", g.argv[i], file_is_normal_dir(zMbcs));
		@@ -996,11 +996,11 @@
996	996	**
997	997	** Usage: %fossil test-simplify-name FILENAME...
998	998	**
999	999	** Print the simplified versions of each FILENAME.
1000	1000	*/
1001		-void cmd_test_simplify_name(void){
	1001	+void test_simplify_name_cmd(void){
1002	1002	int i;
1003	1003	char *z;
1004	1004	for(i=2; i<g.argc; i++){
1005	1005	z = mprintf("%s", g.argv[i]);
1006	1006	fossil_print("[%s] -> ", z);
		@@ -1184,11 +1184,11 @@
1184	1184	** --allow-symlinks BOOLEAN Temporarily turn allow-symlinks on/off
1185	1185	** --open-config Open the configuration database first.
1186	1186	** --slash Trailing slashes, if any, are retained.
1187	1187	** --reset Reset cached stat() info for each file.
1188	1188	*/
1189		-void cmd_test_file_environment(void){
	1189	+void test_file_environment_cmd(void){
1190	1190	int i;
1191	1191	int slashFlag = find_option("slash",0,0)!=0;
1192	1192	int resetFlag = find_option("reset",0,0)!=0;
1193	1193	const char *zAllow = find_option("allow-symlinks",0,1);
1194	1194	if( find_option("open-config", 0, 0)!=0 ){
		@@ -1214,11 +1214,11 @@
1214	1214	** Usage: %fossil test-canonical-name FILENAME...
1215	1215	**
1216	1216	** Test the operation of the canonical name generator.
1217	1217	** Also test Fossil's ability to measure attributes of a file.
1218	1218	*/
1219		-void cmd_test_canonical_name(void){
	1219	+void test_canonical_name_cmd(void){
1220	1220	int i;
1221	1221	Blob x;
1222	1222	int slashFlag = find_option("slash",0,0)!=0;
1223	1223	blob_zero(&x);
1224	1224	for(i=2; i<g.argc; i++){
		@@ -1349,11 +1349,11 @@
1349	1349	/*
1350	1350	** COMMAND: test-relative-name
1351	1351	**
1352	1352	** Test the operation of the relative name generator.
1353	1353	*/
1354		-void cmd_test_relative_name(void){
	1354	+void test_relative_name_cmd(void){
1355	1355	int i;
1356	1356	Blob x;
1357	1357	int slashFlag = find_option("slash",0,0)!=0;
1358	1358	blob_zero(&x);
1359	1359	for(i=2; i<g.argc; i++){
		@@ -1468,11 +1468,11 @@
1468	1468	** Options:
1469	1469	** --absolute Return an absolute path instead of a relative one.
1470	1470	** --case-sensitive B Enable or disable case-sensitive filenames. B is
1471	1471	** a boolean: "yes", "no", "true", "false", etc.
1472	1472	*/
1473		-void cmd_test_tree_name(void){
	1473	+void test_tree_name_cmd(void){
1474	1474	int i;
1475	1475	Blob x;
1476	1476	int absoluteFlag = find_option("absolute",0,0)!=0;
1477	1477	db_find_and_open_repository(0,0);
1478	1478	blob_zero(&x);
		@@ -1661,11 +1661,11 @@
1661	1661	**
1662	1662	** Generate temporary filenames derived from BASENAME. Use the --time
1663	1663	** option to generate temp names based on the time of day. If --tag NAME
1664	1664	** is specified, try to use NAME as the differentiator in the temp file.
1665	1665	*/
1666		-void file_test_tempname(void){
	1666	+void test_tempname_cmd(void){
1667	1667	int i;
1668	1668	const char *zSuffix = find_option("time",0,1);
1669	1669	Blob x = BLOB_INITIALIZER;
1670	1670	char *z;
1671	1671	const char *zTag = find_option("tag",0,1);
		@@ -1893,11 +1893,11 @@
1893	1893	** COMMAND: test-valid-for-windows
1894	1894	** Usage: fossil test-valid-for-windows FILENAME ....
1895	1895	**
1896	1896	** Show which filenames are not valid for Windows
1897	1897	*/
1898		-void file_test_valid_for_windows(void){
	1898	+void test_valid_for_windows_cmd(void){
1899	1899	int i;
1900	1900	for(i=2; i<g.argc; i++){
1901	1901	fossil_print("%s %s\n", file_is_win_reserved(g.argv[i]), g.argv[i]);
1902	1902	}
1903	1903	}
1904	1904

	--- src/file.c
	+++ src/file.c
	@@ -511,11 +511,11 @@
511	**
512	** Make a copy of the file at SOURCE into a new name DESTINATION. Any
513	** directories in the path leading up to DESTINATION that do not already
514	** exist are created automatically.
515	*/
516	void test_file_copy(void){
517	if( g.argc!=4 ){
518	fossil_fatal("Usage: %s test-file-copy SOURCE DESTINATION", g.argv[0]);
519	}
520	file_copy(g.argv[2], g.argv[3]);
521	}
	@@ -578,11 +578,11 @@
578	**
579	** Usage: %fossil test-set-mtime FILENAME DATE/TIME
580	**
581	** Sets the mtime of the named file to the date/time shown.
582	*/
583	void test_set_mtime(void){
584	const char *zFile;
585	char *zDate;
586	i64 iMTime;
587	if( g.argc!=4 ){
588	usage("FILENAME DATE/TIME");
	@@ -734,11 +734,11 @@
734	** Usage: %fossil test-is-normal-dir NAME...
735	**
736	** Returns non-zero if the specified names represent real directories, i.e.
737	** not junctions, symbolic links, etc.
738	*/
739	void test_is_normal_dir(void){
740	int i;
741	for(i=2; i<g.argc; i++){
742	wchar_t *zMbcs = fossil_utf8_to_path(g.argv[i], 1);
743	fossil_print("ATTRS \"%s\" -> %lx\n", g.argv[i], GetFileAttributesW(zMbcs));
744	fossil_print("ISDIR \"%s\" -> %d\n", g.argv[i], file_is_normal_dir(zMbcs));
	@@ -996,11 +996,11 @@
996	**
997	** Usage: %fossil test-simplify-name FILENAME...
998	**
999	** Print the simplified versions of each FILENAME.
1000	*/
1001	void cmd_test_simplify_name(void){
1002	int i;
1003	char *z;
1004	for(i=2; i<g.argc; i++){
1005	z = mprintf("%s", g.argv[i]);
1006	fossil_print("[%s] -> ", z);
	@@ -1184,11 +1184,11 @@
1184	** --allow-symlinks BOOLEAN Temporarily turn allow-symlinks on/off
1185	** --open-config Open the configuration database first.
1186	** --slash Trailing slashes, if any, are retained.
1187	** --reset Reset cached stat() info for each file.
1188	*/
1189	void cmd_test_file_environment(void){
1190	int i;
1191	int slashFlag = find_option("slash",0,0)!=0;
1192	int resetFlag = find_option("reset",0,0)!=0;
1193	const char *zAllow = find_option("allow-symlinks",0,1);
1194	if( find_option("open-config", 0, 0)!=0 ){
	@@ -1214,11 +1214,11 @@
1214	** Usage: %fossil test-canonical-name FILENAME...
1215	**
1216	** Test the operation of the canonical name generator.
1217	** Also test Fossil's ability to measure attributes of a file.
1218	*/
1219	void cmd_test_canonical_name(void){
1220	int i;
1221	Blob x;
1222	int slashFlag = find_option("slash",0,0)!=0;
1223	blob_zero(&x);
1224	for(i=2; i<g.argc; i++){
	@@ -1349,11 +1349,11 @@
1349	/*
1350	** COMMAND: test-relative-name
1351	**
1352	** Test the operation of the relative name generator.
1353	*/
1354	void cmd_test_relative_name(void){
1355	int i;
1356	Blob x;
1357	int slashFlag = find_option("slash",0,0)!=0;
1358	blob_zero(&x);
1359	for(i=2; i<g.argc; i++){
	@@ -1468,11 +1468,11 @@
1468	** Options:
1469	** --absolute Return an absolute path instead of a relative one.
1470	** --case-sensitive B Enable or disable case-sensitive filenames. B is
1471	** a boolean: "yes", "no", "true", "false", etc.
1472	*/
1473	void cmd_test_tree_name(void){
1474	int i;
1475	Blob x;
1476	int absoluteFlag = find_option("absolute",0,0)!=0;
1477	db_find_and_open_repository(0,0);
1478	blob_zero(&x);
	@@ -1661,11 +1661,11 @@
1661	**
1662	** Generate temporary filenames derived from BASENAME. Use the --time
1663	** option to generate temp names based on the time of day. If --tag NAME
1664	** is specified, try to use NAME as the differentiator in the temp file.
1665	*/
1666	void file_test_tempname(void){
1667	int i;
1668	const char *zSuffix = find_option("time",0,1);
1669	Blob x = BLOB_INITIALIZER;
1670	char *z;
1671	const char *zTag = find_option("tag",0,1);
	@@ -1893,11 +1893,11 @@
1893	** COMMAND: test-valid-for-windows
1894	** Usage: fossil test-valid-for-windows FILENAME ....
1895	**
1896	** Show which filenames are not valid for Windows
1897	*/
1898	void file_test_valid_for_windows(void){
1899	int i;
1900	for(i=2; i<g.argc; i++){
1901	fossil_print("%s %s\n", file_is_win_reserved(g.argv[i]), g.argv[i]);
1902	}
1903	}
1904

	--- src/file.c
	+++ src/file.c
	@@ -511,11 +511,11 @@
511	**
512	** Make a copy of the file at SOURCE into a new name DESTINATION. Any
513	** directories in the path leading up to DESTINATION that do not already
514	** exist are created automatically.
515	*/
516	void test_file_copy_cmd(void){
517	if( g.argc!=4 ){
518	fossil_fatal("Usage: %s test-file-copy SOURCE DESTINATION", g.argv[0]);
519	}
520	file_copy(g.argv[2], g.argv[3]);
521	}
	@@ -578,11 +578,11 @@
578	**
579	** Usage: %fossil test-set-mtime FILENAME DATE/TIME
580	**
581	** Sets the mtime of the named file to the date/time shown.
582	*/
583	void test_set_mtime_cmd(void){
584	const char *zFile;
585	char *zDate;
586	i64 iMTime;
587	if( g.argc!=4 ){
588	usage("FILENAME DATE/TIME");
	@@ -734,11 +734,11 @@
734	** Usage: %fossil test-is-normal-dir NAME...
735	**
736	** Returns non-zero if the specified names represent real directories, i.e.
737	** not junctions, symbolic links, etc.
738	*/
739	void test_is_normal_dir_cmd(void){
740	int i;
741	for(i=2; i<g.argc; i++){
742	wchar_t *zMbcs = fossil_utf8_to_path(g.argv[i], 1);
743	fossil_print("ATTRS \"%s\" -> %lx\n", g.argv[i], GetFileAttributesW(zMbcs));
744	fossil_print("ISDIR \"%s\" -> %d\n", g.argv[i], file_is_normal_dir(zMbcs));
	@@ -996,11 +996,11 @@
996	**
997	** Usage: %fossil test-simplify-name FILENAME...
998	**
999	** Print the simplified versions of each FILENAME.
1000	*/
1001	void test_simplify_name_cmd(void){
1002	int i;
1003	char *z;
1004	for(i=2; i<g.argc; i++){
1005	z = mprintf("%s", g.argv[i]);
1006	fossil_print("[%s] -> ", z);
	@@ -1184,11 +1184,11 @@
1184	** --allow-symlinks BOOLEAN Temporarily turn allow-symlinks on/off
1185	** --open-config Open the configuration database first.
1186	** --slash Trailing slashes, if any, are retained.
1187	** --reset Reset cached stat() info for each file.
1188	*/
1189	void test_file_environment_cmd(void){
1190	int i;
1191	int slashFlag = find_option("slash",0,0)!=0;
1192	int resetFlag = find_option("reset",0,0)!=0;
1193	const char *zAllow = find_option("allow-symlinks",0,1);
1194	if( find_option("open-config", 0, 0)!=0 ){
	@@ -1214,11 +1214,11 @@
1214	** Usage: %fossil test-canonical-name FILENAME...
1215	**
1216	** Test the operation of the canonical name generator.
1217	** Also test Fossil's ability to measure attributes of a file.
1218	*/
1219	void test_canonical_name_cmd(void){
1220	int i;
1221	Blob x;
1222	int slashFlag = find_option("slash",0,0)!=0;
1223	blob_zero(&x);
1224	for(i=2; i<g.argc; i++){
	@@ -1349,11 +1349,11 @@
1349	/*
1350	** COMMAND: test-relative-name
1351	**
1352	** Test the operation of the relative name generator.
1353	*/
1354	void test_relative_name_cmd(void){
1355	int i;
1356	Blob x;
1357	int slashFlag = find_option("slash",0,0)!=0;
1358	blob_zero(&x);
1359	for(i=2; i<g.argc; i++){
	@@ -1468,11 +1468,11 @@
1468	** Options:
1469	** --absolute Return an absolute path instead of a relative one.
1470	** --case-sensitive B Enable or disable case-sensitive filenames. B is
1471	** a boolean: "yes", "no", "true", "false", etc.
1472	*/
1473	void test_tree_name_cmd(void){
1474	int i;
1475	Blob x;
1476	int absoluteFlag = find_option("absolute",0,0)!=0;
1477	db_find_and_open_repository(0,0);
1478	blob_zero(&x);
	@@ -1661,11 +1661,11 @@
1661	**
1662	** Generate temporary filenames derived from BASENAME. Use the --time
1663	** option to generate temp names based on the time of day. If --tag NAME
1664	** is specified, try to use NAME as the differentiator in the temp file.
1665	*/
1666	void test_tempname_cmd(void){
1667	int i;
1668	const char *zSuffix = find_option("time",0,1);
1669	Blob x = BLOB_INITIALIZER;
1670	char *z;
1671	const char *zTag = find_option("tag",0,1);
	@@ -1893,11 +1893,11 @@
1893	** COMMAND: test-valid-for-windows
1894	** Usage: fossil test-valid-for-windows FILENAME ....
1895	**
1896	** Show which filenames are not valid for Windows
1897	*/
1898	void test_valid_for_windows_cmd(void){
1899	int i;
1900	for(i=2; i<g.argc; i++){
1901	fossil_print("%s %s\n", file_is_win_reserved(g.argv[i]), g.argv[i]);
1902	}
1903	}
1904

M src/forum.c

+1 -1

		--- src/forum.c
		+++ src/forum.c
		@@ -253,11 +253,11 @@
253	253	** Display a summary of all messages on a thread THREADID. If the
254	254	** THREADID argument is omitted, then show a list of all threads.
255	255	**
256	256	** This command is intended for testing an analysis only.
257	257	*/
258		-void forumthread_cmd(void){
	258	+void test_forumthread_cmd(void){
259	259	int fpid;
260	260	int froot;
261	261	const char *zName;
262	262	ForumThread *pThread;
263	263	ForumEntry *p;
264	264

	--- src/forum.c
	+++ src/forum.c
	@@ -253,11 +253,11 @@
253	** Display a summary of all messages on a thread THREADID. If the
254	** THREADID argument is omitted, then show a list of all threads.
255	**
256	** This command is intended for testing an analysis only.
257	*/
258	void forumthread_cmd(void){
259	int fpid;
260	int froot;
261	const char *zName;
262	ForumThread *pThread;
263	ForumEntry *p;
264

	--- src/forum.c
	+++ src/forum.c
	@@ -253,11 +253,11 @@
253	** Display a summary of all messages on a thread THREADID. If the
254	** THREADID argument is omitted, then show a list of all threads.
255	**
256	** This command is intended for testing an analysis only.
257	*/
258	void test_forumthread_cmd(void){
259	int fpid;
260	int froot;
261	const char *zName;
262	ForumThread *pThread;
263	ForumEntry *p;
264

M src/fuzz.c

+1 -1

		--- src/fuzz.c
		+++ src/fuzz.c
		@@ -125,11 +125,11 @@
125	125	**
126	126	** wiki Fuzz the Fossil-wiki translator
127	127	** markdown Fuzz the markdown translator
128	128	** artifact Fuzz the artifact parser
129	129	*/
130		-void fuzz_command(void){
	130	+void test_fuzz_cmd(void){
131	131	Blob in;
132	132	int i;
133	133	fuzzer_options();
134	134	verify_all_options();
135	135	for(i=2; i<g.argc; i++){
136	136

	--- src/fuzz.c
	+++ src/fuzz.c
	@@ -125,11 +125,11 @@
125	**
126	** wiki Fuzz the Fossil-wiki translator
127	** markdown Fuzz the markdown translator
128	** artifact Fuzz the artifact parser
129	*/
130	void fuzz_command(void){
131	Blob in;
132	int i;
133	fuzzer_options();
134	verify_all_options();
135	for(i=2; i<g.argc; i++){
136

	--- src/fuzz.c
	+++ src/fuzz.c
	@@ -125,11 +125,11 @@
125	**
126	** wiki Fuzz the Fossil-wiki translator
127	** markdown Fuzz the markdown translator
128	** artifact Fuzz the artifact parser
129	*/
130	void test_fuzz_cmd(void){
131	Blob in;
132	int i;
133	fuzzer_options();
134	verify_all_options();
135	for(i=2; i<g.argc; i++){
136

M src/glob.c

+1 -1

		--- src/glob.c
		+++ src/glob.c
		@@ -177,11 +177,11 @@
177	177	**
178	178	** If PATTERN begins with "@" the rest of the pattern is understood
179	179	** to be a setting name (such as binary-glob, crln-glob, or encoding-glob)
180	180	** and the value of that setting is used as the actually glob pattern.
181	181	*/
182		-void glob_test_cmd(void){
	182	+void test_glob_cmd(void){
183	183	Glob *pGlob;
184	184	int i;
185	185	char *zPattern;
186	186	if( g.argc<4 ) usage("PATTERN STRING ...");
187	187	zPattern = g.argv[2];
188	188

	--- src/glob.c
	+++ src/glob.c
	@@ -177,11 +177,11 @@
177	**
178	** If PATTERN begins with "@" the rest of the pattern is understood
179	** to be a setting name (such as binary-glob, crln-glob, or encoding-glob)
180	** and the value of that setting is used as the actually glob pattern.
181	*/
182	void glob_test_cmd(void){
183	Glob *pGlob;
184	int i;
185	char *zPattern;
186	if( g.argc<4 ) usage("PATTERN STRING ...");
187	zPattern = g.argv[2];
188

	--- src/glob.c
	+++ src/glob.c
	@@ -177,11 +177,11 @@
177	**
178	** If PATTERN begins with "@" the rest of the pattern is understood
179	** to be a setting name (such as binary-glob, crln-glob, or encoding-glob)
180	** and the value of that setting is used as the actually glob pattern.
181	*/
182	void test_glob_cmd(void){
183	Glob *pGlob;
184	int i;
185	char *zPattern;
186	if( g.argc<4 ) usage("PATTERN STRING ...");
187	zPattern = g.argv[2];
188

M src/hname.c

+1 -1

		--- src/hname.c
		+++ src/hname.c
		@@ -256,11 +256,11 @@
256	256	** The default hash policy for existing repositories is "auto", which will
257	257	** immediately promote to "sha3" if the repository contains one or more
258	258	** artifacts with SHA3 names. The default hash policy for new repositories
259	259	** is "shun-sha1".
260	260	*/
261		-void hash_policy_command(void){
	261	+void hash_policy_cmd(void){
262	262	int i;
263	263	db_find_and_open_repository(0, 0);
264	264	if( g.argc!=2 && g.argc!=3 ) usage("?NEW-POLICY?");
265	265	if( g.argc==2 ){
266	266	fossil_print("%s\n", azPolicy[g.eHashPolicy]);
267	267

	--- src/hname.c
	+++ src/hname.c
	@@ -256,11 +256,11 @@
256	** The default hash policy for existing repositories is "auto", which will
257	** immediately promote to "sha3" if the repository contains one or more
258	** artifacts with SHA3 names. The default hash policy for new repositories
259	** is "shun-sha1".
260	*/
261	void hash_policy_command(void){
262	int i;
263	db_find_and_open_repository(0, 0);
264	if( g.argc!=2 && g.argc!=3 ) usage("?NEW-POLICY?");
265	if( g.argc==2 ){
266	fossil_print("%s\n", azPolicy[g.eHashPolicy]);
267

	--- src/hname.c
	+++ src/hname.c
	@@ -256,11 +256,11 @@
256	** The default hash policy for existing repositories is "auto", which will
257	** immediately promote to "sha3" if the repository contains one or more
258	** artifacts with SHA3 names. The default hash policy for new repositories
259	** is "shun-sha1".
260	*/
261	void hash_policy_cmd(void){
262	int i;
263	db_find_and_open_repository(0, 0);
264	if( g.argc!=2 && g.argc!=3 ) usage("?NEW-POLICY?");
265	if( g.argc==2 ){
266	fossil_print("%s\n", azPolicy[g.eHashPolicy]);
267

M src/http.c

+1 -1

		--- src/http.c
		+++ src/http.c
		@@ -484,11 +484,11 @@
484	484	** --compress Use ZLIB compression on the payload
485	485	** --mimetype TYPE Mimetype of the payload
486	486	** --out FILE Store the reply in FILE
487	487	** -v Verbose output
488	488	*/
489		-void test_httpmsg_command(void){
	489	+void test_httpmsg_cmd(void){
490	490	const char *zMimetype;
491	491	const char *zInFile;
492	492	const char *zOutFile;
493	493	Blob in, out;
494	494	unsigned int mHttpFlags = HTTP_GENERIC\|HTTP_NOCOMPRESS;
495	495

	--- src/http.c
	+++ src/http.c
	@@ -484,11 +484,11 @@
484	** --compress Use ZLIB compression on the payload
485	** --mimetype TYPE Mimetype of the payload
486	** --out FILE Store the reply in FILE
487	** -v Verbose output
488	*/
489	void test_httpmsg_command(void){
490	const char *zMimetype;
491	const char *zInFile;
492	const char *zOutFile;
493	Blob in, out;
494	unsigned int mHttpFlags = HTTP_GENERIC\|HTTP_NOCOMPRESS;
495

	--- src/http.c
	+++ src/http.c
	@@ -484,11 +484,11 @@
484	** --compress Use ZLIB compression on the payload
485	** --mimetype TYPE Mimetype of the payload
486	** --out FILE Store the reply in FILE
487	** -v Verbose output
488	*/
489	void test_httpmsg_cmd(void){
490	const char *zMimetype;
491	const char *zInFile;
492	const char *zOutFile;
493	Blob in, out;
494	unsigned int mHttpFlags = HTTP_GENERIC\|HTTP_NOCOMPRESS;
495

M src/info.c

+6 -6

		--- src/info.c
		+++ src/info.c
		@@ -340,11 +340,11 @@
340	340	**
341	341	** Show a timeline of all check-ins and other events that have entries
342	342	** in the backlink table. This is used for testing the rendering
343	343	** of the "References" section of the /info page.
344	344	*/
345		-void backlink_timeline_page(void){
	345	+void test_backlinks_page(void){
346	346	Blob sql;
347	347	Stmt q;
348	348
349	349	login_check_credentials();
350	350	if( !g.perm.Read \|\| !g.perm.RdTkt \|\| !g.perm.RdWiki ){
		@@ -639,12 +639,12 @@
639	639	db_finalize(&q);
640	640	style_footer();
641	641	}
642	642
643	643	/*
644		-** WEBPAGE: vinfo
645	644	** WEBPAGE: ci
	645	+** WEBPAGE: vinfo
646	646	** URL: /ci/ARTIFACTID
647	647	** OR: /ci?name=ARTIFACTID
648	648	**
649	649	** Display information about a particular check-in. The exact
650	650	** same information is shown on the /info page if the name query
		@@ -1696,11 +1696,11 @@
1696	1696	** regex=REGEX Only show differences that match REGEX
1697	1697	** sbs=BOOLEAN Turn side-by-side diffs on and off (default: on)
1698	1698	** verbose=BOOLEAN Show more detail when describing artifacts
1699	1699	** w=BOOLEAN Ignore whitespace
1700	1700	*/
1701		-void diff_page(void){
	1701	+void fdiff_page(void){
1702	1702	int v1, v2;
1703	1703	int isPatch = P("patch")!=0;
1704	1704	int diffType; /* 0: none, 1: unified, 2: side-by-side */
1705	1705	char *zV1;
1706	1706	char *zV2;
		@@ -2187,11 +2187,11 @@
2187	2187	if( isFile ){
2188	2188	/* Do a top-level directory listing in /file mode if no argument
2189	2189	** specified */
2190	2190	if( zName==0 \|\| zName[0]==0 ){
2191	2191	if( P("ci")==0 ) cgi_set_query_parameter("ci","tip");
2192		- page_tree();
	2192	+ tree_page();
2193	2193	return;
2194	2194	}
2195	2195	/* Look for a single file with the given name */
2196	2196	rid = db_int(0,
2197	2197	"SELECT fid FROM filename, mlink, event"
		@@ -2210,11 +2210,11 @@
2210	2210	"SELECT 1 FROM filename"
2211	2211	" WHERE name GLOB '%.q/' AND substr(name,1,%d)=='%.*q/';",
2212	2212	nName, zName, nName+1, nName, zName
2213	2213	) ){
2214	2214	if( P("ci")==0 ) cgi_set_query_parameter("ci","tip");
2215		- page_tree();
	2215	+ tree_page();
2216	2216	return;
2217	2217	}
2218	2218	}
2219	2219	/* If no file or directory called NAME: issue an error */
2220	2220	if( rid==0 ){
		@@ -3136,11 +3136,11 @@
3136	3136	** year-month-day form, it may be truncated, the "T" may be replaced by
3137	3137	** a space, and it may also name a timezone offset from UTC as "-HH:MM"
3138	3138	** (westward) or "+HH:MM" (eastward). Either no timezone suffix or "Z"
3139	3139	** means UTC.
3140	3140	*/
3141		-void ci_amend_cmd(void){
	3141	+void amend_cmd(void){
3142	3142	int rid;
3143	3143	const char zComment; / Current comment on the check-in */
3144	3144	const char zNewComment; / Revised check-in comment */
3145	3145	const char zComFile; / Filename from which to read comment */
3146	3146	const char zUser; / Current user for the check-in */
3147	3147

	--- src/info.c
	+++ src/info.c
	@@ -340,11 +340,11 @@
340	**
341	** Show a timeline of all check-ins and other events that have entries
342	** in the backlink table. This is used for testing the rendering
343	** of the "References" section of the /info page.
344	*/
345	void backlink_timeline_page(void){
346	Blob sql;
347	Stmt q;
348
349	login_check_credentials();
350	if( !g.perm.Read \|\| !g.perm.RdTkt \|\| !g.perm.RdWiki ){
	@@ -639,12 +639,12 @@
639	db_finalize(&q);
640	style_footer();
641	}
642
643	/*
644	** WEBPAGE: vinfo
645	** WEBPAGE: ci

646	** URL: /ci/ARTIFACTID
647	** OR: /ci?name=ARTIFACTID
648	**
649	** Display information about a particular check-in. The exact
650	** same information is shown on the /info page if the name query
	@@ -1696,11 +1696,11 @@
1696	** regex=REGEX Only show differences that match REGEX
1697	** sbs=BOOLEAN Turn side-by-side diffs on and off (default: on)
1698	** verbose=BOOLEAN Show more detail when describing artifacts
1699	** w=BOOLEAN Ignore whitespace
1700	*/
1701	void diff_page(void){
1702	int v1, v2;
1703	int isPatch = P("patch")!=0;
1704	int diffType; /* 0: none, 1: unified, 2: side-by-side */
1705	char *zV1;
1706	char *zV2;
	@@ -2187,11 +2187,11 @@
2187	if( isFile ){
2188	/* Do a top-level directory listing in /file mode if no argument
2189	** specified */
2190	if( zName==0 \|\| zName[0]==0 ){
2191	if( P("ci")==0 ) cgi_set_query_parameter("ci","tip");
2192	page_tree();
2193	return;
2194	}
2195	/* Look for a single file with the given name */
2196	rid = db_int(0,
2197	"SELECT fid FROM filename, mlink, event"
	@@ -2210,11 +2210,11 @@
2210	"SELECT 1 FROM filename"
2211	" WHERE name GLOB '%.q/' AND substr(name,1,%d)=='%.*q/';",
2212	nName, zName, nName+1, nName, zName
2213	) ){
2214	if( P("ci")==0 ) cgi_set_query_parameter("ci","tip");
2215	page_tree();
2216	return;
2217	}
2218	}
2219	/* If no file or directory called NAME: issue an error */
2220	if( rid==0 ){
	@@ -3136,11 +3136,11 @@
3136	** year-month-day form, it may be truncated, the "T" may be replaced by
3137	** a space, and it may also name a timezone offset from UTC as "-HH:MM"
3138	** (westward) or "+HH:MM" (eastward). Either no timezone suffix or "Z"
3139	** means UTC.
3140	*/
3141	void ci_amend_cmd(void){
3142	int rid;
3143	const char zComment; / Current comment on the check-in */
3144	const char zNewComment; / Revised check-in comment */
3145	const char zComFile; / Filename from which to read comment */
3146	const char zUser; / Current user for the check-in */
3147

	--- src/info.c
	+++ src/info.c
	@@ -340,11 +340,11 @@
340	**
341	** Show a timeline of all check-ins and other events that have entries
342	** in the backlink table. This is used for testing the rendering
343	** of the "References" section of the /info page.
344	*/
345	void test_backlinks_page(void){
346	Blob sql;
347	Stmt q;
348
349	login_check_credentials();
350	if( !g.perm.Read \|\| !g.perm.RdTkt \|\| !g.perm.RdWiki ){
	@@ -639,12 +639,12 @@
639	db_finalize(&q);
640	style_footer();
641	}
642
643	/*

644	** WEBPAGE: ci
645	** WEBPAGE: vinfo
646	** URL: /ci/ARTIFACTID
647	** OR: /ci?name=ARTIFACTID
648	**
649	** Display information about a particular check-in. The exact
650	** same information is shown on the /info page if the name query
	@@ -1696,11 +1696,11 @@
1696	** regex=REGEX Only show differences that match REGEX
1697	** sbs=BOOLEAN Turn side-by-side diffs on and off (default: on)
1698	** verbose=BOOLEAN Show more detail when describing artifacts
1699	** w=BOOLEAN Ignore whitespace
1700	*/
1701	void fdiff_page(void){
1702	int v1, v2;
1703	int isPatch = P("patch")!=0;
1704	int diffType; /* 0: none, 1: unified, 2: side-by-side */
1705	char *zV1;
1706	char *zV2;
	@@ -2187,11 +2187,11 @@
2187	if( isFile ){
2188	/* Do a top-level directory listing in /file mode if no argument
2189	** specified */
2190	if( zName==0 \|\| zName[0]==0 ){
2191	if( P("ci")==0 ) cgi_set_query_parameter("ci","tip");
2192	tree_page();
2193	return;
2194	}
2195	/* Look for a single file with the given name */
2196	rid = db_int(0,
2197	"SELECT fid FROM filename, mlink, event"
	@@ -2210,11 +2210,11 @@
2210	"SELECT 1 FROM filename"
2211	" WHERE name GLOB '%.q/' AND substr(name,1,%d)=='%.*q/';",
2212	nName, zName, nName+1, nName, zName
2213	) ){
2214	if( P("ci")==0 ) cgi_set_query_parameter("ci","tip");
2215	tree_page();
2216	return;
2217	}
2218	}
2219	/* If no file or directory called NAME: issue an error */
2220	if( rid==0 ){
	@@ -3136,11 +3136,11 @@
3136	** year-month-day form, it may be truncated, the "T" may be replaced by
3137	** a space, and it may also name a timezone offset from UTC as "-HH:MM"
3138	** (westward) or "+HH:MM" (eastward). Either no timezone suffix or "Z"
3139	** means UTC.
3140	*/
3141	void amend_cmd(void){
3142	int rid;
3143	const char zComment; / Current comment on the check-in */
3144	const char zNewComment; / Revised check-in comment */
3145	const char zComFile; / Filename from which to read comment */
3146	const char zUser; / Current user for the check-in */
3147

M src/json.c

+9 -9

		--- src/json.c
		+++ src/json.c
		@@ -23,12 +23,12 @@
23	23	** https://docs.google.com/document/d/1fXViveNhDbiXgCuE7QDXQOKeFzf2qNUkBEgiUvoqFN4/view
24	24	**
25	25	**
26	26	** Notes for hackers...
27	27	**
28		-** Here's how command/page dispatching works: json_page_top() (in HTTP mode) or
29		-** json_cmd_top() (in CLI mode) catch the "json" path/command. Those functions then
	28	+** Here's how command/page dispatching works: json_page() (in HTTP mode) or
	29	+** json_cmd() (in CLI mode) catch the "json" path/command. Those functions then
30	30	** dispatch to a JSON-mode-specific command/page handler with the type fossil_json_f().
31	31	** See the API docs for that typedef (below) for the semantics of the callbacks.
32	32	**
33	33	**
34	34	*/
		@@ -711,11 +711,11 @@
711	711	}
712	712
713	713	/*
714	714	** Initializes some JSON bits which need to be initialized relatively
715	715	** early on. It should only be called from cgi_init() or
716		-** json_cmd_top() (early on in those functions).
	716	+** json_cmd() (early on in those functions).
717	717	**
718	718	** Initializes g.json.gc and g.json.param. This code does not (and
719	719	** must not) rely on any of the fossil environment having been set
720	720	** up. e.g. it must not use cgi_parameter() and friends because this
721	721	** must be called before those data are initialized.
		@@ -919,11 +919,11 @@
919	919	}
920	920
921	921
922	922	/*
923	923	** Performs some common initialization of JSON-related state. Must be
924		-** called by the json_page_top() and json_cmd_top() dispatching
	924	+** called by the json_page() and json_cmd() dispatching
925	925	** functions to set up the JSON stat used by the dispatched functions.
926	926	**
927	927	** Implicitly sets up the login information state in CGI mode, but
928	928	** does not perform any permissions checking. It _might_ (haven't
929	929	** tested this) die with an error if an auth cookie is malformed.
		@@ -2216,11 +2216,11 @@
2216	2216	/* Last entry MUST have a NULL name. */
2217	2217	{NULL,NULL,0}
2218	2218	};
2219	2219
2220	2220	/*
2221		-** Internal helper for json_cmd_top() and json_page_top().
	2221	+** Internal helper for json_cmd() and json_page().
2222	2222	**
2223	2223	** Searches JsonPageDefs for a command with the given name. If found,
2224	2224	** it is used to generate and output a JSON response. If not found, it
2225	2225	** generates a JSON-style error response. Returns 0 on success, non-0
2226	2226	** on error. On error it will set g.json's error state.
		@@ -2257,13 +2257,13 @@
2257	2257	/*
2258	2258	** WEBPAGE: json
2259	2259	**
2260	2260	** Pages under /json/... must be entered into JsonPageDefs.
2261	2261	** This function dispatches them, and is the HTTP equivalent of
2262		-** json_cmd_top().
	2262	+** json_cmd().
2263	2263	*/
2264		-void json_page_top(void){
	2264	+void json_page(void){
2265	2265	char const * zCommand;
2266	2266	assert(g.json.gc.a && "json_main_bootstrap() was not called!");
2267	2267	json_mode_bootstrap();
2268	2268	zCommand = json_command_arg(1);
2269	2269	if(!zCommand \|\| !*zCommand){
		@@ -2278,11 +2278,11 @@
2278	2278
2279	2279	#ifdef FOSSIL_ENABLE_JSON
2280	2280	/* dupe ifdef needed for mkindex */
2281	2281	/*
2282	2282	** This function dispatches json commands and is the CLI equivalent of
2283		-** json_page_top().
	2283	+** json_page().
2284	2284	**
2285	2285	** COMMAND: json
2286	2286	**
2287	2287	** Usage: %fossil json SUBCOMMAND ?OPTIONS?
2288	2288	**
		@@ -2321,11 +2321,11 @@
2321	2321	**
2322	2322	** Run '%fossil json' without any subcommand to see the full list (but be
2323	2323	** aware that some listed might not yet be fully implemented).
2324	2324	**
2325	2325	*/
2326		-void json_cmd_top(void){
	2326	+void json_cmd(void){
2327	2327	char const * cmd = NULL;
2328	2328	int rc = 0;
2329	2329	memset( &g.perm, 0xff, sizeof(g.perm) )
2330	2330	/* In CLI mode fossil does not use permissions
2331	2331	and they all default to false. We enable them
2332	2332

	--- src/json.c
	+++ src/json.c
	@@ -23,12 +23,12 @@
23	** https://docs.google.com/document/d/1fXViveNhDbiXgCuE7QDXQOKeFzf2qNUkBEgiUvoqFN4/view
24	**
25	**
26	** Notes for hackers...
27	**
28	** Here's how command/page dispatching works: json_page_top() (in HTTP mode) or
29	** json_cmd_top() (in CLI mode) catch the "json" path/command. Those functions then
30	** dispatch to a JSON-mode-specific command/page handler with the type fossil_json_f().
31	** See the API docs for that typedef (below) for the semantics of the callbacks.
32	**
33	**
34	*/
	@@ -711,11 +711,11 @@
711	}
712
713	/*
714	** Initializes some JSON bits which need to be initialized relatively
715	** early on. It should only be called from cgi_init() or
716	** json_cmd_top() (early on in those functions).
717	**
718	** Initializes g.json.gc and g.json.param. This code does not (and
719	** must not) rely on any of the fossil environment having been set
720	** up. e.g. it must not use cgi_parameter() and friends because this
721	** must be called before those data are initialized.
	@@ -919,11 +919,11 @@
919	}
920
921
922	/*
923	** Performs some common initialization of JSON-related state. Must be
924	** called by the json_page_top() and json_cmd_top() dispatching
925	** functions to set up the JSON stat used by the dispatched functions.
926	**
927	** Implicitly sets up the login information state in CGI mode, but
928	** does not perform any permissions checking. It _might_ (haven't
929	** tested this) die with an error if an auth cookie is malformed.
	@@ -2216,11 +2216,11 @@
2216	/* Last entry MUST have a NULL name. */
2217	{NULL,NULL,0}
2218	};
2219
2220	/*
2221	** Internal helper for json_cmd_top() and json_page_top().
2222	**
2223	** Searches JsonPageDefs for a command with the given name. If found,
2224	** it is used to generate and output a JSON response. If not found, it
2225	** generates a JSON-style error response. Returns 0 on success, non-0
2226	** on error. On error it will set g.json's error state.
	@@ -2257,13 +2257,13 @@
2257	/*
2258	** WEBPAGE: json
2259	**
2260	** Pages under /json/... must be entered into JsonPageDefs.
2261	** This function dispatches them, and is the HTTP equivalent of
2262	** json_cmd_top().
2263	*/
2264	void json_page_top(void){
2265	char const * zCommand;
2266	assert(g.json.gc.a && "json_main_bootstrap() was not called!");
2267	json_mode_bootstrap();
2268	zCommand = json_command_arg(1);
2269	if(!zCommand \|\| !*zCommand){
	@@ -2278,11 +2278,11 @@
2278
2279	#ifdef FOSSIL_ENABLE_JSON
2280	/* dupe ifdef needed for mkindex */
2281	/*
2282	** This function dispatches json commands and is the CLI equivalent of
2283	** json_page_top().
2284	**
2285	** COMMAND: json
2286	**
2287	** Usage: %fossil json SUBCOMMAND ?OPTIONS?
2288	**
	@@ -2321,11 +2321,11 @@
2321	**
2322	** Run '%fossil json' without any subcommand to see the full list (but be
2323	** aware that some listed might not yet be fully implemented).
2324	**
2325	*/
2326	void json_cmd_top(void){
2327	char const * cmd = NULL;
2328	int rc = 0;
2329	memset( &g.perm, 0xff, sizeof(g.perm) )
2330	/* In CLI mode fossil does not use permissions
2331	and they all default to false. We enable them
2332

	--- src/json.c
	+++ src/json.c
	@@ -23,12 +23,12 @@
23	** https://docs.google.com/document/d/1fXViveNhDbiXgCuE7QDXQOKeFzf2qNUkBEgiUvoqFN4/view
24	**
25	**
26	** Notes for hackers...
27	**
28	** Here's how command/page dispatching works: json_page() (in HTTP mode) or
29	** json_cmd() (in CLI mode) catch the "json" path/command. Those functions then
30	** dispatch to a JSON-mode-specific command/page handler with the type fossil_json_f().
31	** See the API docs for that typedef (below) for the semantics of the callbacks.
32	**
33	**
34	*/
	@@ -711,11 +711,11 @@
711	}
712
713	/*
714	** Initializes some JSON bits which need to be initialized relatively
715	** early on. It should only be called from cgi_init() or
716	** json_cmd() (early on in those functions).
717	**
718	** Initializes g.json.gc and g.json.param. This code does not (and
719	** must not) rely on any of the fossil environment having been set
720	** up. e.g. it must not use cgi_parameter() and friends because this
721	** must be called before those data are initialized.
	@@ -919,11 +919,11 @@
919	}
920
921
922	/*
923	** Performs some common initialization of JSON-related state. Must be
924	** called by the json_page() and json_cmd() dispatching
925	** functions to set up the JSON stat used by the dispatched functions.
926	**
927	** Implicitly sets up the login information state in CGI mode, but
928	** does not perform any permissions checking. It _might_ (haven't
929	** tested this) die with an error if an auth cookie is malformed.
	@@ -2216,11 +2216,11 @@
2216	/* Last entry MUST have a NULL name. */
2217	{NULL,NULL,0}
2218	};
2219
2220	/*
2221	** Internal helper for json_cmd() and json_page().
2222	**
2223	** Searches JsonPageDefs for a command with the given name. If found,
2224	** it is used to generate and output a JSON response. If not found, it
2225	** generates a JSON-style error response. Returns 0 on success, non-0
2226	** on error. On error it will set g.json's error state.
	@@ -2257,13 +2257,13 @@
2257	/*
2258	** WEBPAGE: json
2259	**
2260	** Pages under /json/... must be entered into JsonPageDefs.
2261	** This function dispatches them, and is the HTTP equivalent of
2262	** json_cmd().
2263	*/
2264	void json_page(void){
2265	char const * zCommand;
2266	assert(g.json.gc.a && "json_main_bootstrap() was not called!");
2267	json_mode_bootstrap();
2268	zCommand = json_command_arg(1);
2269	if(!zCommand \|\| !*zCommand){
	@@ -2278,11 +2278,11 @@
2278
2279	#ifdef FOSSIL_ENABLE_JSON
2280	/* dupe ifdef needed for mkindex */
2281	/*
2282	** This function dispatches json commands and is the CLI equivalent of
2283	** json_page().
2284	**
2285	** COMMAND: json
2286	**
2287	** Usage: %fossil json SUBCOMMAND ?OPTIONS?
2288	**
	@@ -2321,11 +2321,11 @@
2321	**
2322	** Run '%fossil json' without any subcommand to see the full list (but be
2323	** aware that some listed might not yet be fully implemented).
2324	**
2325	*/
2326	void json_cmd(void){
2327	char const * cmd = NULL;
2328	int rc = 0;
2329	memset( &g.perm, 0xff, sizeof(g.perm) )
2330	/* In CLI mode fossil does not use permissions
2331	and they all default to false. We enable them
2332

M src/leaf.c

+1 -1

		--- src/leaf.c
		+++ src/leaf.c
		@@ -251,11 +251,11 @@
251	251	** Usage: %fossil NAME ...
252	252	**
253	253	** Resolve each name on the command line and call leaf_ambiguity_warning()
254	254	** for each resulting RID.
255	255	*/
256		-void leaf_ambiguity_warning_test(void){
	256	+void test_leaf_ambiguity_cmd(void){
257	257	int i;
258	258	int rid;
259	259	int rc;
260	260	db_find_and_open_repository(0,0);
261	261	verify_all_options();
262	262

	--- src/leaf.c
	+++ src/leaf.c
	@@ -251,11 +251,11 @@
251	** Usage: %fossil NAME ...
252	**
253	** Resolve each name on the command line and call leaf_ambiguity_warning()
254	** for each resulting RID.
255	*/
256	void leaf_ambiguity_warning_test(void){
257	int i;
258	int rid;
259	int rc;
260	db_find_and_open_repository(0,0);
261	verify_all_options();
262

	--- src/leaf.c
	+++ src/leaf.c
	@@ -251,11 +251,11 @@
251	** Usage: %fossil NAME ...
252	**
253	** Resolve each name on the command line and call leaf_ambiguity_warning()
254	** for each resulting RID.
255	*/
256	void test_leaf_ambiguity_cmd(void){
257	int i;
258	int rid;
259	int rc;
260	db_find_and_open_repository(0,0);
261	verify_all_options();
262

M src/loadctrl.c

+1 -1

		--- src/loadctrl.c
		+++ src/loadctrl.c
		@@ -40,11 +40,11 @@
40	40	**
41	41	** %fossil test-loadavg
42	42	**
43	43	** Print the load average on the host machine.
44	44	*/
45		-void loadavg_test_cmd(void){
	45	+void test_loadavg_cmd(void){
46	46	fossil_print("load-average: %f\n", load_average());
47	47	}
48	48
49	49	/*
50	50	** Abort the current operation of the load average of the host computer
51	51

	--- src/loadctrl.c
	+++ src/loadctrl.c
	@@ -40,11 +40,11 @@
40	**
41	** %fossil test-loadavg
42	**
43	** Print the load average on the host machine.
44	*/
45	void loadavg_test_cmd(void){
46	fossil_print("load-average: %f\n", load_average());
47	}
48
49	/*
50	** Abort the current operation of the load average of the host computer
51

	--- src/loadctrl.c
	+++ src/loadctrl.c
	@@ -40,11 +40,11 @@
40	**
41	** %fossil test-loadavg
42	**
43	** Print the load average on the host machine.
44	*/
45	void test_loadavg_cmd(void){
46	fossil_print("load-average: %f\n", load_average());
47	}
48
49	/*
50	** Abort the current operation of the load average of the host computer
51

M src/login.c

+2 -2

		--- src/login.c
		+++ src/login.c
		@@ -421,11 +421,11 @@
421	421	**
422	422	** Read lines of text from standard input. Interpret each line of text
423	423	** as a User-Agent string from an HTTP header. Label each line as HUMAN
424	424	** or ROBOT.
425	425	*/
426		-void test_ishuman(void){
	426	+void test_ishuman_cmd(void){
427	427	char zLine[3000];
428	428	while( fgets(zLine, sizeof(zLine), stdin) ){
429	429	fossil_print("%s %s", isHuman(zLine) ? "HUMAN" : "ROBOT", zLine);
430	430	}
431	431	}
		@@ -1984,11 +1984,11 @@
1984	1984	** access any other group member as long as they have an entry in the
1985	1985	** USER table of that member. If a user changes their password using
1986	1986	** web interface, their password is also automatically changed in every
1987	1987	** other member of the login group.
1988	1988	*/
1989		-void login_group_command(void){
	1989	+void login_group_cmd(void){
1990	1990	const char *zLGName;
1991	1991	const char *zCmd;
1992	1992	int nCmd;
1993	1993	Stmt q;
1994	1994	db_find_and_open_repository(0,0);
1995	1995

	--- src/login.c
	+++ src/login.c
	@@ -421,11 +421,11 @@
421	**
422	** Read lines of text from standard input. Interpret each line of text
423	** as a User-Agent string from an HTTP header. Label each line as HUMAN
424	** or ROBOT.
425	*/
426	void test_ishuman(void){
427	char zLine[3000];
428	while( fgets(zLine, sizeof(zLine), stdin) ){
429	fossil_print("%s %s", isHuman(zLine) ? "HUMAN" : "ROBOT", zLine);
430	}
431	}
	@@ -1984,11 +1984,11 @@
1984	** access any other group member as long as they have an entry in the
1985	** USER table of that member. If a user changes their password using
1986	** web interface, their password is also automatically changed in every
1987	** other member of the login group.
1988	*/
1989	void login_group_command(void){
1990	const char *zLGName;
1991	const char *zCmd;
1992	int nCmd;
1993	Stmt q;
1994	db_find_and_open_repository(0,0);
1995

	--- src/login.c
	+++ src/login.c
	@@ -421,11 +421,11 @@
421	**
422	** Read lines of text from standard input. Interpret each line of text
423	** as a User-Agent string from an HTTP header. Label each line as HUMAN
424	** or ROBOT.
425	*/
426	void test_ishuman_cmd(void){
427	char zLine[3000];
428	while( fgets(zLine, sizeof(zLine), stdin) ){
429	fossil_print("%s %s", isHuman(zLine) ? "HUMAN" : "ROBOT", zLine);
430	}
431	}
	@@ -1984,11 +1984,11 @@
1984	** access any other group member as long as they have an entry in the
1985	** USER table of that member. If a user changes their password using
1986	** web interface, their password is also automatically changed in every
1987	** other member of the login group.
1988	*/
1989	void login_group_cmd(void){
1990	const char *zLGName;
1991	const char *zCmd;
1992	int nCmd;
1993	Stmt q;
1994	db_find_and_open_repository(0,0);
1995

M src/lookslike.c

+1 -1

		--- src/lookslike.c
		+++ src/lookslike.c
		@@ -408,11 +408,11 @@
408	408	** --utf16 Ignoring BOM and file size, force UTF-16 checking
409	409	**
410	410	** FILENAME is the name of a file to check for textual content in the UTF-8
411	411	** and/or UTF-16 encodings.
412	412	*/
413		-void looks_like_utf_test_cmd(void){
	413	+void test_looks_like_utf_cmd(void){
414	414	Blob blob; /* the contents of the specified file */
415	415	int fUtf8 = 0; /* return value of starts_with_utf8_bom() */
416	416	int fUtf16 = 0; /* return value of starts_with_utf16_bom() */
417	417	int fUnicode = 0; /* return value of could_be_utf16() */
418	418	int lookFlags = 0; /* output flags from looks_like_utf8/utf16() */
419	419

	--- src/lookslike.c
	+++ src/lookslike.c
	@@ -408,11 +408,11 @@
408	** --utf16 Ignoring BOM and file size, force UTF-16 checking
409	**
410	** FILENAME is the name of a file to check for textual content in the UTF-8
411	** and/or UTF-16 encodings.
412	*/
413	void looks_like_utf_test_cmd(void){
414	Blob blob; /* the contents of the specified file */
415	int fUtf8 = 0; /* return value of starts_with_utf8_bom() */
416	int fUtf16 = 0; /* return value of starts_with_utf16_bom() */
417	int fUnicode = 0; /* return value of could_be_utf16() */
418	int lookFlags = 0; /* output flags from looks_like_utf8/utf16() */
419

	--- src/lookslike.c
	+++ src/lookslike.c
	@@ -408,11 +408,11 @@
408	** --utf16 Ignoring BOM and file size, force UTF-16 checking
409	**
410	** FILENAME is the name of a file to check for textual content in the UTF-8
411	** and/or UTF-16 encodings.
412	*/
413	void test_looks_like_utf_cmd(void){
414	Blob blob; /* the contents of the specified file */
415	int fUtf8 = 0; /* return value of starts_with_utf8_bom() */
416	int fUtf16 = 0; /* return value of starts_with_utf16_bom() */
417	int fUnicode = 0; /* return value of could_be_utf16() */
418	int lookFlags = 0; /* output flags from looks_like_utf8/utf16() */
419

M src/main.c

+6 -6

		--- src/main.c
		+++ src/main.c
		@@ -1240,11 +1240,11 @@
1240	1240	**
1241	1241	** Query parameters:
1242	1242	**
1243	1243	** verbose Show details
1244	1244	*/
1245		-void test_version_page(void){
	1245	+void version_page(void){
1246	1246	Blob versionInfo;
1247	1247	int verboseFlag;
1248	1248
1249	1249	login_check_credentials();
1250	1250	if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
		@@ -1848,11 +1848,11 @@
1848	1848	Th_WebpageNotify(g.zPath, 0);
1849	1849	}
1850	1850	}
1851	1851	#endif
1852	1852	}
1853		- }else if( pCmd->xFunc!=page_xfer && db_schema_is_outofdate() ){
	1853	+ }else if( pCmd->xFunc!=xfer_page && db_schema_is_outofdate() ){
1854	1854	#ifdef FOSSIL_ENABLE_JSON
1855	1855	if(g.json.isJsonMode){
1856	1856	json_err(FSL_JSON_E_DB_NEEDS_REBUILD,NULL,0);
1857	1857	}else
1858	1858	#endif
		@@ -2040,11 +2040,11 @@
2040	2040	** Most CGI files contain only a "repository:" line. It is uncommon to
2041	2041	** use any other option.
2042	2042	**
2043	2043	** See also: http, server, winsrv
2044	2044	*/
2045		-void cmd_cgi(void){
	2045	+void cgi_cmd(void){
2046	2046	const char *zFile;
2047	2047	const char *zNotFound = 0;
2048	2048	char *azRedirect = 0; / List of repositories to redirect to */
2049	2049	int nRedirect = 0; /* Number of entries in azRedirect */
2050	2050	Glob pFileGlob = 0; / Pattern for files */
		@@ -2377,11 +2377,11 @@
2377	2377	** --usepidkey Use saved encryption key from parent process. This is
2378	2378	** only necessary when using SEE on Windows.
2379	2379	**
2380	2380	** See also: cgi, server, winsrv
2381	2381	*/
2382		-void cmd_http(void){
	2382	+void http_cmd(void){
2383	2383	const char *zIpAddr = 0;
2384	2384	const char *zNotFound;
2385	2385	const char *zHost;
2386	2386	const char *zAltBase;
2387	2387	const char *zFileGlob;
		@@ -2500,11 +2500,11 @@
2500	2500	**
2501	2501	** Options:
2502	2502	** --th-trace trace TH1 execution (for debugging purposes)
2503	2503	**
2504	2504	*/
2505		-void cmd_test_http(void){
	2505	+void test_http_cmd(void){
2506	2506	const char zIpAddr; / IP address of remote client */
2507	2507
2508	2508	Th_InitTraceLog();
2509	2509	login_set_capabilities("sx", 0);
2510	2510	g.useLocalauth = 1;
		@@ -2646,11 +2646,11 @@
2646	2646	** --usepidkey Use saved encryption key from parent process. This is
2647	2647	** only necessary when using SEE on Windows.
2648	2648	**
2649	2649	** See also: cgi, http, winsrv
2650	2650	*/
2651		-void cmd_webserver(void){
	2651	+void webserver_cmd(void){
2652	2652	int iPort, mxPort; /* Range of TCP ports allowed */
2653	2653	const char zPort; / Value of the --port option */
2654	2654	const char zBrowser; / Name of web browser program */
2655	2655	char zBrowserCmd = 0; / Command to launch the web browser */
2656	2656	int isUiCmd; /* True if command is "ui", not "server' */
2657	2657

	--- src/main.c
	+++ src/main.c
	@@ -1240,11 +1240,11 @@
1240	**
1241	** Query parameters:
1242	**
1243	** verbose Show details
1244	*/
1245	void test_version_page(void){
1246	Blob versionInfo;
1247	int verboseFlag;
1248
1249	login_check_credentials();
1250	if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
	@@ -1848,11 +1848,11 @@
1848	Th_WebpageNotify(g.zPath, 0);
1849	}
1850	}
1851	#endif
1852	}
1853	}else if( pCmd->xFunc!=page_xfer && db_schema_is_outofdate() ){
1854	#ifdef FOSSIL_ENABLE_JSON
1855	if(g.json.isJsonMode){
1856	json_err(FSL_JSON_E_DB_NEEDS_REBUILD,NULL,0);
1857	}else
1858	#endif
	@@ -2040,11 +2040,11 @@
2040	** Most CGI files contain only a "repository:" line. It is uncommon to
2041	** use any other option.
2042	**
2043	** See also: http, server, winsrv
2044	*/
2045	void cmd_cgi(void){
2046	const char *zFile;
2047	const char *zNotFound = 0;
2048	char *azRedirect = 0; / List of repositories to redirect to */
2049	int nRedirect = 0; /* Number of entries in azRedirect */
2050	Glob pFileGlob = 0; / Pattern for files */
	@@ -2377,11 +2377,11 @@
2377	** --usepidkey Use saved encryption key from parent process. This is
2378	** only necessary when using SEE on Windows.
2379	**
2380	** See also: cgi, server, winsrv
2381	*/
2382	void cmd_http(void){
2383	const char *zIpAddr = 0;
2384	const char *zNotFound;
2385	const char *zHost;
2386	const char *zAltBase;
2387	const char *zFileGlob;
	@@ -2500,11 +2500,11 @@
2500	**
2501	** Options:
2502	** --th-trace trace TH1 execution (for debugging purposes)
2503	**
2504	*/
2505	void cmd_test_http(void){
2506	const char zIpAddr; / IP address of remote client */
2507
2508	Th_InitTraceLog();
2509	login_set_capabilities("sx", 0);
2510	g.useLocalauth = 1;
	@@ -2646,11 +2646,11 @@
2646	** --usepidkey Use saved encryption key from parent process. This is
2647	** only necessary when using SEE on Windows.
2648	**
2649	** See also: cgi, http, winsrv
2650	*/
2651	void cmd_webserver(void){
2652	int iPort, mxPort; /* Range of TCP ports allowed */
2653	const char zPort; / Value of the --port option */
2654	const char zBrowser; / Name of web browser program */
2655	char zBrowserCmd = 0; / Command to launch the web browser */
2656	int isUiCmd; /* True if command is "ui", not "server' */
2657

	--- src/main.c
	+++ src/main.c
	@@ -1240,11 +1240,11 @@
1240	**
1241	** Query parameters:
1242	**
1243	** verbose Show details
1244	*/
1245	void version_page(void){
1246	Blob versionInfo;
1247	int verboseFlag;
1248
1249	login_check_credentials();
1250	if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
	@@ -1848,11 +1848,11 @@
1848	Th_WebpageNotify(g.zPath, 0);
1849	}
1850	}
1851	#endif
1852	}
1853	}else if( pCmd->xFunc!=xfer_page && db_schema_is_outofdate() ){
1854	#ifdef FOSSIL_ENABLE_JSON
1855	if(g.json.isJsonMode){
1856	json_err(FSL_JSON_E_DB_NEEDS_REBUILD,NULL,0);
1857	}else
1858	#endif
	@@ -2040,11 +2040,11 @@
2040	** Most CGI files contain only a "repository:" line. It is uncommon to
2041	** use any other option.
2042	**
2043	** See also: http, server, winsrv
2044	*/
2045	void cgi_cmd(void){
2046	const char *zFile;
2047	const char *zNotFound = 0;
2048	char *azRedirect = 0; / List of repositories to redirect to */
2049	int nRedirect = 0; /* Number of entries in azRedirect */
2050	Glob pFileGlob = 0; / Pattern for files */
	@@ -2377,11 +2377,11 @@
2377	** --usepidkey Use saved encryption key from parent process. This is
2378	** only necessary when using SEE on Windows.
2379	**
2380	** See also: cgi, server, winsrv
2381	*/
2382	void http_cmd(void){
2383	const char *zIpAddr = 0;
2384	const char *zNotFound;
2385	const char *zHost;
2386	const char *zAltBase;
2387	const char *zFileGlob;
	@@ -2500,11 +2500,11 @@
2500	**
2501	** Options:
2502	** --th-trace trace TH1 execution (for debugging purposes)
2503	**
2504	*/
2505	void test_http_cmd(void){
2506	const char zIpAddr; / IP address of remote client */
2507
2508	Th_InitTraceLog();
2509	login_set_capabilities("sx", 0);
2510	g.useLocalauth = 1;
	@@ -2646,11 +2646,11 @@
2646	** --usepidkey Use saved encryption key from parent process. This is
2647	** only necessary when using SEE on Windows.
2648	**
2649	** See also: cgi, http, winsrv
2650	*/
2651	void webserver_cmd(void){
2652	int iPort, mxPort; /* Range of TCP ports allowed */
2653	const char zPort; / Value of the --port option */
2654	const char zBrowser; / Name of web browser program */
2655	char zBrowserCmd = 0; / Command to launch the web browser */
2656	int isUiCmd; /* True if command is "ui", not "server' */
2657

M src/manifest.c

+2 -2

		--- src/manifest.c
		+++ src/manifest.c
		@@ -1133,11 +1133,11 @@
1133	1133	** Usage: %fossil test-parse-manifest FILENAME ?N?
1134	1134	**
1135	1135	** Parse the manifest(s) given on the command-line and report any
1136	1136	** errors. If the N argument is given, run the parsing N times.
1137	1137	*/
1138		-void manifest_test_parse_cmd(void){
	1138	+void test_parse_manifest_cmd(void){
1139	1139	Manifest *p;
1140	1140	Blob b;
1141	1141	int i;
1142	1142	int n = 1;
1143	1143	db_find_and_open_repository(0,0);
		@@ -1170,11 +1170,11 @@
1170	1170	** repositories after making any changes to the manifest_parse()
1171	1171	** implementation to confirm that the changes did not break anything.
1172	1172	**
1173	1173	** If the --limit N argument is given, parse no more than N blobs
1174	1174	*/
1175		-void manifest_test_parse_all_blobs_cmd(void){
	1175	+void test_parse_all_blobs_cmd(void){
1176	1176	Manifest *p;
1177	1177	Blob err;
1178	1178	Stmt q;
1179	1179	int nTest = 0;
1180	1180	int nErr = 0;
1181	1181

	--- src/manifest.c
	+++ src/manifest.c
	@@ -1133,11 +1133,11 @@
1133	** Usage: %fossil test-parse-manifest FILENAME ?N?
1134	**
1135	** Parse the manifest(s) given on the command-line and report any
1136	** errors. If the N argument is given, run the parsing N times.
1137	*/
1138	void manifest_test_parse_cmd(void){
1139	Manifest *p;
1140	Blob b;
1141	int i;
1142	int n = 1;
1143	db_find_and_open_repository(0,0);
	@@ -1170,11 +1170,11 @@
1170	** repositories after making any changes to the manifest_parse()
1171	** implementation to confirm that the changes did not break anything.
1172	**
1173	** If the --limit N argument is given, parse no more than N blobs
1174	*/
1175	void manifest_test_parse_all_blobs_cmd(void){
1176	Manifest *p;
1177	Blob err;
1178	Stmt q;
1179	int nTest = 0;
1180	int nErr = 0;
1181

	--- src/manifest.c
	+++ src/manifest.c
	@@ -1133,11 +1133,11 @@
1133	** Usage: %fossil test-parse-manifest FILENAME ?N?
1134	**
1135	** Parse the manifest(s) given on the command-line and report any
1136	** errors. If the N argument is given, run the parsing N times.
1137	*/
1138	void test_parse_manifest_cmd(void){
1139	Manifest *p;
1140	Blob b;
1141	int i;
1142	int n = 1;
1143	db_find_and_open_repository(0,0);
	@@ -1170,11 +1170,11 @@
1170	** repositories after making any changes to the manifest_parse()
1171	** implementation to confirm that the changes did not break anything.
1172	**
1173	** If the --limit N argument is given, parse no more than N blobs
1174	*/
1175	void test_parse_all_blobs_cmd(void){
1176	Manifest *p;
1177	Blob err;
1178	Stmt q;
1179	int nTest = 0;
1180	int nErr = 0;
1181

M src/md5.c

+1 -1

		--- src/md5.c
		+++ src/md5.c
		@@ -442,11 +442,11 @@
442	442	** Usage: %fossil md5sum FILES....
443	443	**
444	444	** Compute an MD5 checksum of all files named on the command-line.
445	445	** If a file is named "-" then content is read from standard input.
446	446	*/
447		-void md5sum_test(void){
	447	+void md5sum_cmd(void){
448	448	int i;
449	449	Blob in;
450	450	Blob cksum;
451	451
452	452	for(i=2; i<g.argc; i++){
453	453

	--- src/md5.c
	+++ src/md5.c
	@@ -442,11 +442,11 @@
442	** Usage: %fossil md5sum FILES....
443	**
444	** Compute an MD5 checksum of all files named on the command-line.
445	** If a file is named "-" then content is read from standard input.
446	*/
447	void md5sum_test(void){
448	int i;
449	Blob in;
450	Blob cksum;
451
452	for(i=2; i<g.argc; i++){
453

	--- src/md5.c
	+++ src/md5.c
	@@ -442,11 +442,11 @@
442	** Usage: %fossil md5sum FILES....
443	**
444	** Compute an MD5 checksum of all files named on the command-line.
445	** If a file is named "-" then content is read from standard input.
446	*/
447	void md5sum_cmd(void){
448	int i;
449	Blob in;
450	Blob cksum;
451
452	for(i=2; i<g.argc; i++){
453

M src/name.c

+4 -4

		--- src/name.c
		+++ src/name.c
		@@ -530,11 +530,11 @@
530	530	** Usage: %fossil test-name-to-id [--count N] NAME
531	531	**
532	532	** Convert a NAME to a full artifact ID. Repeat the conversion N
533	533	** times (for timing purposes) if the --count option is given.
534	534	*/
535		-void test_name_to_id(void){
	535	+void test_name_to_id_cmd(void){
536	536	int i;
537	537	int n = 0;
538	538	Blob name;
539	539	db_must_be_within_tree();
540	540	for(i=2; i<g.argc; i++){
		@@ -1335,11 +1335,11 @@
1335	1335	**
1336	1336	** Usage: %fossil test-unclustered
1337	1337	**
1338	1338	** Show all artifacts in the unclustered table
1339	1339	*/
1340		-void test_unclusterd_cmd(void){
	1340	+void test_unclustered_cmd(void){
1341	1341	db_find_and_open_repository(0,0);
1342	1342	describe_artifacts_to_stdout("IN unclustered", 0);
1343	1343	}
1344	1344
1345	1345	/*
		@@ -1347,11 +1347,11 @@
1347	1347	**
1348	1348	** Usage: %fossil test-phantoms
1349	1349	**
1350	1350	** Show all phantom artifacts
1351	1351	*/
1352		-void test_phatoms_cmd(void){
	1352	+void test_phantoms_cmd(void){
1353	1353	db_find_and_open_repository(0,0);
1354	1354	describe_artifacts_to_stdout("IN (SELECT rid FROM blob WHERE size<0)", 0);
1355	1355	}
1356	1356
1357	1357	/* Maximum number of collision examples to remember */
		@@ -1425,11 +1425,11 @@
1425	1425	/*
1426	1426	** WEBPAGE: hash-collisions
1427	1427	**
1428	1428	** Show the number of hash collisions for hash prefixes of various lengths.
1429	1429	*/
1430		-void hash_collisions_webpage(void){
	1430	+void hash_collisions_page(void){
1431	1431	login_check_credentials();
1432	1432	if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
1433	1433	style_header("Hash Prefix Collisions");
1434	1434	style_submenu_element("Activity Reports", "reports");
1435	1435	style_submenu_element("Stats", "stat");
1436	1436

	--- src/name.c
	+++ src/name.c
	@@ -530,11 +530,11 @@
530	** Usage: %fossil test-name-to-id [--count N] NAME
531	**
532	** Convert a NAME to a full artifact ID. Repeat the conversion N
533	** times (for timing purposes) if the --count option is given.
534	*/
535	void test_name_to_id(void){
536	int i;
537	int n = 0;
538	Blob name;
539	db_must_be_within_tree();
540	for(i=2; i<g.argc; i++){
	@@ -1335,11 +1335,11 @@
1335	**
1336	** Usage: %fossil test-unclustered
1337	**
1338	** Show all artifacts in the unclustered table
1339	*/
1340	void test_unclusterd_cmd(void){
1341	db_find_and_open_repository(0,0);
1342	describe_artifacts_to_stdout("IN unclustered", 0);
1343	}
1344
1345	/*
	@@ -1347,11 +1347,11 @@
1347	**
1348	** Usage: %fossil test-phantoms
1349	**
1350	** Show all phantom artifacts
1351	*/
1352	void test_phatoms_cmd(void){
1353	db_find_and_open_repository(0,0);
1354	describe_artifacts_to_stdout("IN (SELECT rid FROM blob WHERE size<0)", 0);
1355	}
1356
1357	/* Maximum number of collision examples to remember */
	@@ -1425,11 +1425,11 @@
1425	/*
1426	** WEBPAGE: hash-collisions
1427	**
1428	** Show the number of hash collisions for hash prefixes of various lengths.
1429	*/
1430	void hash_collisions_webpage(void){
1431	login_check_credentials();
1432	if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
1433	style_header("Hash Prefix Collisions");
1434	style_submenu_element("Activity Reports", "reports");
1435	style_submenu_element("Stats", "stat");
1436

	--- src/name.c
	+++ src/name.c
	@@ -530,11 +530,11 @@
530	** Usage: %fossil test-name-to-id [--count N] NAME
531	**
532	** Convert a NAME to a full artifact ID. Repeat the conversion N
533	** times (for timing purposes) if the --count option is given.
534	*/
535	void test_name_to_id_cmd(void){
536	int i;
537	int n = 0;
538	Blob name;
539	db_must_be_within_tree();
540	for(i=2; i<g.argc; i++){
	@@ -1335,11 +1335,11 @@
1335	**
1336	** Usage: %fossil test-unclustered
1337	**
1338	** Show all artifacts in the unclustered table
1339	*/
1340	void test_unclustered_cmd(void){
1341	db_find_and_open_repository(0,0);
1342	describe_artifacts_to_stdout("IN unclustered", 0);
1343	}
1344
1345	/*
	@@ -1347,11 +1347,11 @@
1347	**
1348	** Usage: %fossil test-phantoms
1349	**
1350	** Show all phantom artifacts
1351	*/
1352	void test_phantoms_cmd(void){
1353	db_find_and_open_repository(0,0);
1354	describe_artifacts_to_stdout("IN (SELECT rid FROM blob WHERE size<0)", 0);
1355	}
1356
1357	/* Maximum number of collision examples to remember */
	@@ -1425,11 +1425,11 @@
1425	/*
1426	** WEBPAGE: hash-collisions
1427	**
1428	** Show the number of hash collisions for hash prefixes of various lengths.
1429	*/
1430	void hash_collisions_page(void){
1431	login_check_credentials();
1432	if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
1433	style_header("Hash Prefix Collisions");
1434	style_submenu_element("Activity Reports", "reports");
1435	style_submenu_element("Stats", "stat");
1436

M src/path.c

+3 -3

		--- src/path.c
		+++ src/path.c
		@@ -243,11 +243,11 @@
243	243	** Usage: %fossil test-shortest-path ?--no-merge? VERSION1 VERSION2
244	244	**
245	245	** Report the shortest path between two check-ins. If the --no-merge flag
246	246	** is used, follow only direct parent-child paths and omit merge links.
247	247	*/
248		-void shortest_path_test_cmd(void){
	248	+void test_shortest_path_cmd(void){
249	249	int iFrom;
250	250	int iTo;
251	251	PathNode *p;
252	252	int n;
253	253	int directOnly;
		@@ -349,11 +349,11 @@
349	349	** Usage: %fossil test-ancestor-path VERSION1 VERSION2
350	350	**
351	351	** Report the path from VERSION1 to VERSION2 through their most recent
352	352	** common ancestor.
353	353	*/
354		-void ancestor_path_test_cmd(void){
	354	+void test_ancestor_path_cmd(void){
355	355	int iFrom;
356	356	int iTo;
357	357	int iPivot;
358	358	PathNode *p;
359	359	int n;
		@@ -521,11 +521,11 @@
521	521	**
522	522	** Usage: %fossil test-name-changes [--debug] VERSION1 VERSION2
523	523	**
524	524	** Show all filename changes that occur going from VERSION1 to VERSION2
525	525	*/
526		-void test_name_change(void){
	526	+void test_name_changes_cmd(void){
527	527	int iFrom;
528	528	int iTo;
529	529	int *aChng;
530	530	int nChng;
531	531	int i;
532	532

	--- src/path.c
	+++ src/path.c
	@@ -243,11 +243,11 @@
243	** Usage: %fossil test-shortest-path ?--no-merge? VERSION1 VERSION2
244	**
245	** Report the shortest path between two check-ins. If the --no-merge flag
246	** is used, follow only direct parent-child paths and omit merge links.
247	*/
248	void shortest_path_test_cmd(void){
249	int iFrom;
250	int iTo;
251	PathNode *p;
252	int n;
253	int directOnly;
	@@ -349,11 +349,11 @@
349	** Usage: %fossil test-ancestor-path VERSION1 VERSION2
350	**
351	** Report the path from VERSION1 to VERSION2 through their most recent
352	** common ancestor.
353	*/
354	void ancestor_path_test_cmd(void){
355	int iFrom;
356	int iTo;
357	int iPivot;
358	PathNode *p;
359	int n;
	@@ -521,11 +521,11 @@
521	**
522	** Usage: %fossil test-name-changes [--debug] VERSION1 VERSION2
523	**
524	** Show all filename changes that occur going from VERSION1 to VERSION2
525	*/
526	void test_name_change(void){
527	int iFrom;
528	int iTo;
529	int *aChng;
530	int nChng;
531	int i;
532

	--- src/path.c
	+++ src/path.c
	@@ -243,11 +243,11 @@
243	** Usage: %fossil test-shortest-path ?--no-merge? VERSION1 VERSION2
244	**
245	** Report the shortest path between two check-ins. If the --no-merge flag
246	** is used, follow only direct parent-child paths and omit merge links.
247	*/
248	void test_shortest_path_cmd(void){
249	int iFrom;
250	int iTo;
251	PathNode *p;
252	int n;
253	int directOnly;
	@@ -349,11 +349,11 @@
349	** Usage: %fossil test-ancestor-path VERSION1 VERSION2
350	**
351	** Report the path from VERSION1 to VERSION2 through their most recent
352	** common ancestor.
353	*/
354	void test_ancestor_path_cmd(void){
355	int iFrom;
356	int iTo;
357	int iPivot;
358	PathNode *p;
359	int n;
	@@ -521,11 +521,11 @@
521	**
522	** Usage: %fossil test-name-changes [--debug] VERSION1 VERSION2
523	**
524	** Show all filename changes that occur going from VERSION1 to VERSION2
525	*/
526	void test_name_changes_cmd(void){
527	int iFrom;
528	int iTo;
529	int *aChng;
530	int nChng;
531	int i;
532

M src/piechart.c

+1 -1

		--- src/piechart.c
		+++ src/piechart.c
		@@ -265,11 +265,11 @@
265	265	/*
266	266	** WEBPAGE: test-piechart
267	267	**
268	268	** Generate a pie-chart based on data input from a form.
269	269	*/
270		-void piechart_test_page(void){
	270	+void test_piechart_page(void){
271	271	const char *zData;
272	272	Stmt ins;
273	273	int n = 0;
274	274	int width;
275	275	int height;
276	276

	--- src/piechart.c
	+++ src/piechart.c
	@@ -265,11 +265,11 @@
265	/*
266	** WEBPAGE: test-piechart
267	**
268	** Generate a pie-chart based on data input from a form.
269	*/
270	void piechart_test_page(void){
271	const char *zData;
272	Stmt ins;
273	int n = 0;
274	int width;
275	int height;
276

	--- src/piechart.c
	+++ src/piechart.c
	@@ -265,11 +265,11 @@
265	/*
266	** WEBPAGE: test-piechart
267	**
268	** Generate a pie-chart based on data input from a form.
269	*/
270	void test_piechart_page(void){
271	const char *zData;
272	Stmt ins;
273	int n = 0;
274	int width;
275	int height;
276

M src/pivot.c

+1 -1

		--- src/pivot.c
		+++ src/pivot.c
		@@ -161,11 +161,11 @@
161	161	** Test the pivot_find() procedure.
162	162	**
163	163	** Options:
164	164	** --ignore-merges Ignore merges for discovering name pivots
165	165	*/
166		-void test_find_pivot(void){
	166	+void test_find_pivot_cmd(void){
167	167	int i, rid;
168	168	int ignoreMerges = find_option("ignore-merges",0,0)!=0;
169	169	int showDetails = find_option("details",0,0)!=0;
170	170	if( g.argc<4 ){
171	171	usage("?options? PRIMARY SECONDARY ...");
172	172

	--- src/pivot.c
	+++ src/pivot.c
	@@ -161,11 +161,11 @@
161	** Test the pivot_find() procedure.
162	**
163	** Options:
164	** --ignore-merges Ignore merges for discovering name pivots
165	*/
166	void test_find_pivot(void){
167	int i, rid;
168	int ignoreMerges = find_option("ignore-merges",0,0)!=0;
169	int showDetails = find_option("details",0,0)!=0;
170	if( g.argc<4 ){
171	usage("?options? PRIMARY SECONDARY ...");
172

	--- src/pivot.c
	+++ src/pivot.c
	@@ -161,11 +161,11 @@
161	** Test the pivot_find() procedure.
162	**
163	** Options:
164	** --ignore-merges Ignore merges for discovering name pivots
165	*/
166	void test_find_pivot_cmd(void){
167	int i, rid;
168	int ignoreMerges = find_option("ignore-merges",0,0)!=0;
169	int showDetails = find_option("details",0,0)!=0;
170	if( g.argc<4 ){
171	usage("?options? PRIMARY SECONDARY ...");
172

M src/rebuild.c

+3 -3

		--- src/rebuild.c
		+++ src/rebuild.c
		@@ -358,11 +358,11 @@
358	358	}
359	359
360	360	/*
361	361	** Core function to rebuild the information in the derived tables of a
362	362	** fossil repository from the blobs. This function is shared between
363		-** 'rebuild_database' ('rebuild') and 'reconstruct_cmd'
	363	+** 'rebuild_database_cmd' ('rebuild') and 'reconstruct_cmd'
364	364	** ('reconstruct'), both of which have to regenerate this information
365	365	** from scratch.
366	366	**
367	367	** If the randomize parameter is true, then the BLOBs are deliberately
368	368	** extracted in a random order. This feature is used to test the
		@@ -604,11 +604,11 @@
604	604	** --vacuum Run VACUUM on the database after rebuilding
605	605	** --wal Set Write-Ahead-Log journalling mode on the database
606	606	**
607	607	** See also: deconstruct, reconstruct
608	608	*/
609		-void rebuild_database(void){
	609	+void rebuild_database_cmd(void){
610	610	int forceFlag;
611	611	int randomizeFlag;
612	612	int errCnt = 0;
613	613	int omitVerify;
614	614	int doClustering;
		@@ -773,11 +773,11 @@
773	773	** COMMAND: test-create-clusters
774	774	**
775	775	** Create clusters for all unclustered artifacts if the number of unclustered
776	776	** artifacts exceeds the current clustering threshold.
777	777	*/
778		-void test_createcluster_cmd(void){
	778	+void test_create_clusters_cmd(void){
779	779	if( g.argc==3 ){
780	780	db_open_repository(g.argv[2]);
781	781	}else{
782	782	db_find_and_open_repository(0, 0);
783	783	if( g.argc!=2 ){
784	784

	--- src/rebuild.c
	+++ src/rebuild.c
	@@ -358,11 +358,11 @@
358	}
359
360	/*
361	** Core function to rebuild the information in the derived tables of a
362	** fossil repository from the blobs. This function is shared between
363	** 'rebuild_database' ('rebuild') and 'reconstruct_cmd'
364	** ('reconstruct'), both of which have to regenerate this information
365	** from scratch.
366	**
367	** If the randomize parameter is true, then the BLOBs are deliberately
368	** extracted in a random order. This feature is used to test the
	@@ -604,11 +604,11 @@
604	** --vacuum Run VACUUM on the database after rebuilding
605	** --wal Set Write-Ahead-Log journalling mode on the database
606	**
607	** See also: deconstruct, reconstruct
608	*/
609	void rebuild_database(void){
610	int forceFlag;
611	int randomizeFlag;
612	int errCnt = 0;
613	int omitVerify;
614	int doClustering;
	@@ -773,11 +773,11 @@
773	** COMMAND: test-create-clusters
774	**
775	** Create clusters for all unclustered artifacts if the number of unclustered
776	** artifacts exceeds the current clustering threshold.
777	*/
778	void test_createcluster_cmd(void){
779	if( g.argc==3 ){
780	db_open_repository(g.argv[2]);
781	}else{
782	db_find_and_open_repository(0, 0);
783	if( g.argc!=2 ){
784

	--- src/rebuild.c
	+++ src/rebuild.c
	@@ -358,11 +358,11 @@
358	}
359
360	/*
361	** Core function to rebuild the information in the derived tables of a
362	** fossil repository from the blobs. This function is shared between
363	** 'rebuild_database_cmd' ('rebuild') and 'reconstruct_cmd'
364	** ('reconstruct'), both of which have to regenerate this information
365	** from scratch.
366	**
367	** If the randomize parameter is true, then the BLOBs are deliberately
368	** extracted in a random order. This feature is used to test the
	@@ -604,11 +604,11 @@
604	** --vacuum Run VACUUM on the database after rebuilding
605	** --wal Set Write-Ahead-Log journalling mode on the database
606	**
607	** See also: deconstruct, reconstruct
608	*/
609	void rebuild_database_cmd(void){
610	int forceFlag;
611	int randomizeFlag;
612	int errCnt = 0;
613	int omitVerify;
614	int doClustering;
	@@ -773,11 +773,11 @@
773	** COMMAND: test-create-clusters
774	**
775	** Create clusters for all unclustered artifacts if the number of unclustered
776	** artifacts exceeds the current clustering threshold.
777	*/
778	void test_create_clusters_cmd(void){
779	if( g.argc==3 ){
780	db_open_repository(g.argv[2]);
781	}else{
782	db_find_and_open_repository(0, 0);
783	if( g.argc!=2 ){
784

M src/regexp.c

+2 -2

		--- src/regexp.c
		+++ src/regexp.c
		@@ -764,11 +764,11 @@
764	764	**
765	765	** Options:
766	766	**
767	767	** -i\|--ignore-case Ignore case
768	768	*/
769		-void re_test_grep(void){
	769	+void test_grep_cmd(void){
770	770	ReCompiled *pRe;
771	771	const char *zErr;
772	772	int ignoreCase = find_option("ignore-case","i",0)!=0;
773	773	if( g.argc<3 ){
774	774	usage("REGEXP [FILE...]");
		@@ -817,11 +817,11 @@
817	817	** or unreadable files
818	818	** -v\|--invert-match Invert the sense of matching. Show only
819	819	** files that have no matches. Implies -l
820	820	** --verbose Show each file as it is analyzed
821	821	*/
822		-void re_grep_cmd(void){
	822	+void grep_cmd(void){
823	823	u32 flags = 0;
824	824	int bVerbose = 0;
825	825	ReCompiled *pRe;
826	826	const char *zErr;
827	827	int ignoreCase = 0;
828	828

	--- src/regexp.c
	+++ src/regexp.c
	@@ -764,11 +764,11 @@
764	**
765	** Options:
766	**
767	** -i\|--ignore-case Ignore case
768	*/
769	void re_test_grep(void){
770	ReCompiled *pRe;
771	const char *zErr;
772	int ignoreCase = find_option("ignore-case","i",0)!=0;
773	if( g.argc<3 ){
774	usage("REGEXP [FILE...]");
	@@ -817,11 +817,11 @@
817	** or unreadable files
818	** -v\|--invert-match Invert the sense of matching. Show only
819	** files that have no matches. Implies -l
820	** --verbose Show each file as it is analyzed
821	*/
822	void re_grep_cmd(void){
823	u32 flags = 0;
824	int bVerbose = 0;
825	ReCompiled *pRe;
826	const char *zErr;
827	int ignoreCase = 0;
828

	--- src/regexp.c
	+++ src/regexp.c
	@@ -764,11 +764,11 @@
764	**
765	** Options:
766	**
767	** -i\|--ignore-case Ignore case
768	*/
769	void test_grep_cmd(void){
770	ReCompiled *pRe;
771	const char *zErr;
772	int ignoreCase = find_option("ignore-case","i",0)!=0;
773	if( g.argc<3 ){
774	usage("REGEXP [FILE...]");
	@@ -817,11 +817,11 @@
817	** or unreadable files
818	** -v\|--invert-match Invert the sense of matching. Show only
819	** files that have no matches. Implies -l
820	** --verbose Show each file as it is analyzed
821	*/
822	void grep_cmd(void){
823	u32 flags = 0;
824	int bVerbose = 0;
825	ReCompiled *pRe;
826	const char *zErr;
827	int ignoreCase = 0;
828

M src/repolist.c

+1 -1

		--- src/repolist.c
		+++ src/repolist.c
		@@ -276,11 +276,11 @@
276	276	** Usage: %fossil test-list-page DIRECTORY
277	277	**
278	278	** Show all repositories underneath DIRECTORY. Or if DIRECTORY is "/"
279	279	** show all repositories in the ~/.fossil file.
280	280	*/
281		-void test_list_page(void){
	281	+void test_list_page_cmd(void){
282	282	if( g.argc<3 ){
283	283	g.zRepositoryName = "/";
284	284	}else{
285	285	g.zRepositoryName = g.argv[2];
286	286	}
287	287

	--- src/repolist.c
	+++ src/repolist.c
	@@ -276,11 +276,11 @@
276	** Usage: %fossil test-list-page DIRECTORY
277	**
278	** Show all repositories underneath DIRECTORY. Or if DIRECTORY is "/"
279	** show all repositories in the ~/.fossil file.
280	*/
281	void test_list_page(void){
282	if( g.argc<3 ){
283	g.zRepositoryName = "/";
284	}else{
285	g.zRepositoryName = g.argv[2];
286	}
287

	--- src/repolist.c
	+++ src/repolist.c
	@@ -276,11 +276,11 @@
276	** Usage: %fossil test-list-page DIRECTORY
277	**
278	** Show all repositories underneath DIRECTORY. Or if DIRECTORY is "/"
279	** show all repositories in the ~/.fossil file.
280	*/
281	void test_list_page_cmd(void){
282	if( g.argc<3 ){
283	g.zRepositoryName = "/";
284	}else{
285	g.zRepositoryName = g.argv[2];
286	}
287

M src/report.c

+3 -3

		--- src/report.c
		+++ src/report.c
		@@ -32,11 +32,11 @@
32	32	/*
33	33	** WEBPAGE: reportlist
34	34	**
35	35	** Main menu for Tickets.
36	36	*/
37		-void view_list(void){
	37	+void reportlist_page(void){
38	38	const char *zScript;
39	39	Blob ril; /* Report Item List */
40	40	Stmt q;
41	41	int rn = 0;
42	42	int cnt = 0;
		@@ -299,11 +299,11 @@
299	299	** URL: /rptsql?rn=N
300	300	**
301	301	** Display the SQL query used to generate a ticket report. The rn=N
302	302	** query parameter identifies the specific report number to be displayed.
303	303	*/
304		-void view_see_sql(void){
	304	+void rptsql_page(void){
305	305	int rn;
306	306	const char *zTitle;
307	307	const char *zSQL;
308	308	const char *zOwner;
309	309	const char *zClrKey;
		@@ -357,11 +357,11 @@
357	357	** t=TITLE Title of the report format
358	358	** w=USER Owner of the report format
359	359	** s=SQL SQL text used to implement the report
360	360	** k=KEY Color key
361	361	*/
362		-void view_edit(void){
	362	+void rptedit_page(void){
363	363	int rn;
364	364	const char *zTitle;
365	365	const char *z;
366	366	const char *zOwner;
367	367	const char *zClrKey;
368	368

	--- src/report.c
	+++ src/report.c
	@@ -32,11 +32,11 @@
32	/*
33	** WEBPAGE: reportlist
34	**
35	** Main menu for Tickets.
36	*/
37	void view_list(void){
38	const char *zScript;
39	Blob ril; /* Report Item List */
40	Stmt q;
41	int rn = 0;
42	int cnt = 0;
	@@ -299,11 +299,11 @@
299	** URL: /rptsql?rn=N
300	**
301	** Display the SQL query used to generate a ticket report. The rn=N
302	** query parameter identifies the specific report number to be displayed.
303	*/
304	void view_see_sql(void){
305	int rn;
306	const char *zTitle;
307	const char *zSQL;
308	const char *zOwner;
309	const char *zClrKey;
	@@ -357,11 +357,11 @@
357	** t=TITLE Title of the report format
358	** w=USER Owner of the report format
359	** s=SQL SQL text used to implement the report
360	** k=KEY Color key
361	*/
362	void view_edit(void){
363	int rn;
364	const char *zTitle;
365	const char *z;
366	const char *zOwner;
367	const char *zClrKey;
368

	--- src/report.c
	+++ src/report.c
	@@ -32,11 +32,11 @@
32	/*
33	** WEBPAGE: reportlist
34	**
35	** Main menu for Tickets.
36	*/
37	void reportlist_page(void){
38	const char *zScript;
39	Blob ril; /* Report Item List */
40	Stmt q;
41	int rn = 0;
42	int cnt = 0;
	@@ -299,11 +299,11 @@
299	** URL: /rptsql?rn=N
300	**
301	** Display the SQL query used to generate a ticket report. The rn=N
302	** query parameter identifies the specific report number to be displayed.
303	*/
304	void rptsql_page(void){
305	int rn;
306	const char *zTitle;
307	const char *zSQL;
308	const char *zOwner;
309	const char *zClrKey;
	@@ -357,11 +357,11 @@
357	** t=TITLE Title of the report format
358	** w=USER Owner of the report format
359	** s=SQL SQL text used to implement the report
360	** k=KEY Color key
361	*/
362	void rptedit_page(void){
363	int rn;
364	const char *zTitle;
365	const char *z;
366	const char *zOwner;
367	const char *zClrKey;
368

M src/rss.c

+2 -2

		--- src/rss.c
		+++ src/rss.c
		@@ -40,11 +40,11 @@
40	40	** In addition, name=FILENAME filters for a specific file. This may be
41	41	** combined with one of the other filters (useful for looking at a specific
42	42	** branch).
43	43	*/
44	44
45		-void page_timeline_rss(void){
	45	+void timeline_rss_page(void){
46	46	Stmt q;
47	47	int nLine=0;
48	48	char zPubDate, zProjectName, zProjectDescr, zFreeProjectName=0;
49	49	Blob bSQL;
50	50	const char zType = PD("y","all"); / Type of events. All if NULL */
		@@ -250,11 +250,11 @@
250	250	**
251	251	** -url STRING
252	252	** Sets the RSS feed's root URL to the given string. The default is
253	253	** "URL-PLACEHOLDER" (without quotes).
254	254	*/
255		-void cmd_timeline_rss(void){
	255	+void timeline_rss_cmd(void){
256	256	Stmt q;
257	257	int nLine=0;
258	258	char zPubDate, zProjectName, zProjectDescr, zFreeProjectName=0;
259	259	Blob bSQL;
260	260	const char zType = find_option("type","y",1); / Type of events. All if NULL */
261	261

	--- src/rss.c
	+++ src/rss.c
	@@ -40,11 +40,11 @@
40	** In addition, name=FILENAME filters for a specific file. This may be
41	** combined with one of the other filters (useful for looking at a specific
42	** branch).
43	*/
44
45	void page_timeline_rss(void){
46	Stmt q;
47	int nLine=0;
48	char zPubDate, zProjectName, zProjectDescr, zFreeProjectName=0;
49	Blob bSQL;
50	const char zType = PD("y","all"); / Type of events. All if NULL */
	@@ -250,11 +250,11 @@
250	**
251	** -url STRING
252	** Sets the RSS feed's root URL to the given string. The default is
253	** "URL-PLACEHOLDER" (without quotes).
254	*/
255	void cmd_timeline_rss(void){
256	Stmt q;
257	int nLine=0;
258	char zPubDate, zProjectName, zProjectDescr, zFreeProjectName=0;
259	Blob bSQL;
260	const char zType = find_option("type","y",1); / Type of events. All if NULL */
261

	--- src/rss.c
	+++ src/rss.c
	@@ -40,11 +40,11 @@
40	** In addition, name=FILENAME filters for a specific file. This may be
41	** combined with one of the other filters (useful for looking at a specific
42	** branch).
43	*/
44
45	void timeline_rss_page(void){
46	Stmt q;
47	int nLine=0;
48	char zPubDate, zProjectName, zProjectDescr, zFreeProjectName=0;
49	Blob bSQL;
50	const char zType = PD("y","all"); / Type of events. All if NULL */
	@@ -250,11 +250,11 @@
250	**
251	** -url STRING
252	** Sets the RSS feed's root URL to the given string. The default is
253	** "URL-PLACEHOLDER" (without quotes).
254	*/
255	void timeline_rss_cmd(void){
256	Stmt q;
257	int nLine=0;
258	char zPubDate, zProjectName, zProjectDescr, zFreeProjectName=0;
259	Blob bSQL;
260	const char zType = find_option("type","y",1); / Type of events. All if NULL */
261

M src/search.c

+3 -3

		--- src/search.c
		+++ src/search.c
		@@ -1459,11 +1459,11 @@
1459	1459	** Compute the search text for document TYPE-RID whose name is NAME.
1460	1460	** The TYPE is one of "c", "d", "t", "w", or "e". The RID is the document
1461	1461	** ID. The NAME is used to figure out a mimetype to use for formatting
1462	1462	** the raw document text.
1463	1463	*/
1464		-void test_search_stext(void){
	1464	+void test_search_stext_cmd(void){
1465	1465	Blob out;
1466	1466	db_find_and_open_repository(0,0);
1467	1467	if( g.argc!=5 ) usage("TYPE RID NAME");
1468	1468	search_stext(g.argv[2][0], atoi(g.argv[3]), g.argv[4], &out);
1469	1469	fossil_print("%s\n",blob_str(&out));
		@@ -1476,11 +1476,11 @@
1476	1476	** Usage: fossil test-convert-stext FILE MIMETYPE
1477	1477	**
1478	1478	** Read the content of FILE and convert it to stext according to MIMETYPE.
1479	1479	** Send the result to standard output.
1480	1480	*/
1481		-void test_convert_stext(void){
	1481	+void test_convert_stext_cmd(void){
1482	1482	Blob in, out;
1483	1483	db_find_and_open_repository(0,0);
1484	1484	if( g.argc!=4 ) usage("FILENAME MIMETYPE");
1485	1485	blob_read_from_file(&in, g.argv[2], ExtFILE);
1486	1486	blob_init(&out, 0, 0);
		@@ -1954,11 +1954,11 @@
1954	1954	/*
1955	1955	** WEBPAGE: test-ftsdocs
1956	1956	**
1957	1957	** Show a table of all documents currently in the search index.
1958	1958	*/
1959		-void search_data_page(void){
	1959	+void test_ftsdocs_page(void){
1960	1960	Stmt q;
1961	1961	const char *zId = P("id");
1962	1962	const char *zType = P("y");
1963	1963	const char *zIdxed = P("ixed");
1964	1964	int id;
1965	1965

	--- src/search.c
	+++ src/search.c
	@@ -1459,11 +1459,11 @@
1459	** Compute the search text for document TYPE-RID whose name is NAME.
1460	** The TYPE is one of "c", "d", "t", "w", or "e". The RID is the document
1461	** ID. The NAME is used to figure out a mimetype to use for formatting
1462	** the raw document text.
1463	*/
1464	void test_search_stext(void){
1465	Blob out;
1466	db_find_and_open_repository(0,0);
1467	if( g.argc!=5 ) usage("TYPE RID NAME");
1468	search_stext(g.argv[2][0], atoi(g.argv[3]), g.argv[4], &out);
1469	fossil_print("%s\n",blob_str(&out));
	@@ -1476,11 +1476,11 @@
1476	** Usage: fossil test-convert-stext FILE MIMETYPE
1477	**
1478	** Read the content of FILE and convert it to stext according to MIMETYPE.
1479	** Send the result to standard output.
1480	*/
1481	void test_convert_stext(void){
1482	Blob in, out;
1483	db_find_and_open_repository(0,0);
1484	if( g.argc!=4 ) usage("FILENAME MIMETYPE");
1485	blob_read_from_file(&in, g.argv[2], ExtFILE);
1486	blob_init(&out, 0, 0);
	@@ -1954,11 +1954,11 @@
1954	/*
1955	** WEBPAGE: test-ftsdocs
1956	**
1957	** Show a table of all documents currently in the search index.
1958	*/
1959	void search_data_page(void){
1960	Stmt q;
1961	const char *zId = P("id");
1962	const char *zType = P("y");
1963	const char *zIdxed = P("ixed");
1964	int id;
1965

	--- src/search.c
	+++ src/search.c
	@@ -1459,11 +1459,11 @@
1459	** Compute the search text for document TYPE-RID whose name is NAME.
1460	** The TYPE is one of "c", "d", "t", "w", or "e". The RID is the document
1461	** ID. The NAME is used to figure out a mimetype to use for formatting
1462	** the raw document text.
1463	*/
1464	void test_search_stext_cmd(void){
1465	Blob out;
1466	db_find_and_open_repository(0,0);
1467	if( g.argc!=5 ) usage("TYPE RID NAME");
1468	search_stext(g.argv[2][0], atoi(g.argv[3]), g.argv[4], &out);
1469	fossil_print("%s\n",blob_str(&out));
	@@ -1476,11 +1476,11 @@
1476	** Usage: fossil test-convert-stext FILE MIMETYPE
1477	**
1478	** Read the content of FILE and convert it to stext according to MIMETYPE.
1479	** Send the result to standard output.
1480	*/
1481	void test_convert_stext_cmd(void){
1482	Blob in, out;
1483	db_find_and_open_repository(0,0);
1484	if( g.argc!=4 ) usage("FILENAME MIMETYPE");
1485	blob_read_from_file(&in, g.argv[2], ExtFILE);
1486	blob_init(&out, 0, 0);
	@@ -1954,11 +1954,11 @@
1954	/*
1955	** WEBPAGE: test-ftsdocs
1956	**
1957	** Show a table of all documents currently in the search index.
1958	*/
1959	void test_ftsdocs_page(void){
1960	Stmt q;
1961	const char *zId = P("id");
1962	const char *zType = P("y");
1963	const char *zIdxed = P("ixed");
1964	int id;
1965

M src/setup.c

+14 -14

		--- src/setup.c
		+++ src/setup.c
		@@ -311,11 +311,11 @@
311	311	/*
312	312	** WEBPAGE: setup_access
313	313	**
314	314	** The access-control settings page. Requires Setup privileges.
315	315	*/
316		-void setup_access(void){
	316	+void setup_access_page(void){
317	317	static const char *const azRedirectOpts[] = {
318	318	"0", "Off",
319	319	"1", "Login Page Only",
320	320	"2", "All Pages"
321	321	};
		@@ -542,11 +542,11 @@
542	542	** WEBPAGE: setup_login_group
543	543	**
544	544	** Change how the current repository participates in a login
545	545	** group.
546	546	*/
547		-void setup_login_group(void){
	547	+void setup_login_group_page(void){
548	548	const char *zGroup;
549	549	char *zErrMsg = 0;
550	550	Blob fullName;
551	551	char *zSelfRepo;
552	552	const char *zRepo = PD("repo", "");
		@@ -665,11 +665,11 @@
665	665	** WEBPAGE: setup_timeline
666	666	**
667	667	** Edit administrative settings controlling the display of
668	668	** timelines.
669	669	*/
670		-void setup_timeline(void){
	670	+void setup_timeline_page(void){
671	671	double tmDiff;
672	672	char zTmDiff[20];
673	673	static const char *const azTimeFormats[] = {
674	674	"0", "HH:MM",
675	675	"1", "HH:MM:SS",
		@@ -804,11 +804,11 @@
804	804	** WEBPAGE: setup_settings
805	805	**
806	806	** Change or view miscellaneous settings. Part of the
807	807	** /setup pages requiring Setup privileges.
808	808	*/
809		-void setup_settings(void){
	809	+void setup_settings_page(void){
810	810	int nSetting;
811	811	int i;
812	812	Setting const *pSet;
813	813	const Setting *aSetting = setting_info(&nSetting);
814	814
		@@ -891,11 +891,11 @@
891	891	/*
892	892	** WEBPAGE: setup_config
893	893	**
894	894	** The "Admin/Configuration" page. Requires Setup privilege.
895	895	*/
896		-void setup_config(void){
	896	+void setup_config_page(void){
897	897	login_check_credentials();
898	898	if( !g.perm.Setup ){
899	899	login_needed(0);
900	900	return;
901	901	}
		@@ -987,11 +987,11 @@
987	987	/*
988	988	** WEBPAGE: setup_wiki
989	989	**
990	990	** The "Admin/Wiki" page. Requires Setup privilege.
991	991	*/
992		-void setup_wiki(void){
	992	+void setup_wiki_page(void){
993	993	login_check_credentials();
994	994	if( !g.perm.Setup ){
995	995	login_needed(0);
996	996	return;
997	997	}
		@@ -1047,11 +1047,11 @@
1047	1047	/*
1048	1048	** WEBPAGE: setup_modreq
1049	1049	**
1050	1050	** Admin page for setting up moderation of tickets and wiki.
1051	1051	*/
1052		-void setup_modreq(void){
	1052	+void setup_modreq_page(void){
1053	1053	login_check_credentials();
1054	1054	if( !g.perm.Admin ){
1055	1055	login_needed(0);
1056	1056	return;
1057	1057	}
		@@ -1095,11 +1095,11 @@
1095	1095	** WEBPAGE: setup_adunit
1096	1096	**
1097	1097	** Administrative page for configuring and controlling ad units
1098	1098	** and how they are displayed.
1099	1099	*/
1100		-void setup_adunit(void){
	1100	+void setup_adunit_page(void){
1101	1101	login_check_credentials();
1102	1102	if( !g.perm.Admin ){
1103	1103	login_needed(0);
1104	1104	return;
1105	1105	}
		@@ -1171,11 +1171,11 @@
1171	1171	/*
1172	1172	** WEBPAGE: setup_logo
1173	1173	**
1174	1174	** Administrative page for changing the logo image.
1175	1175	*/
1176		-void setup_logo(void){
	1176	+void setup_logo_page(void){
1177	1177	const char *zLogoMtime = db_get_mtime("logo-image", 0, 0);
1178	1178	const char *zLogoMime = db_get("logo-mimetype","image/gif");
1179	1179	const char *aLogoImg = P("logoim");
1180	1180	int szLogoImg = atoi(PD("logoim:bytes","0"));
1181	1181	const char *zBgMtime = db_get_mtime("background-image", 0, 0);
		@@ -1330,11 +1330,11 @@
1330	1330	** WEBPAGE: admin_sql
1331	1331	**
1332	1332	** Run raw SQL commands against the database file using the web interface.
1333	1333	** Requires Setup privileges.
1334	1334	*/
1335		-void sql_page(void){
	1335	+void admin_sql_page(void){
1336	1336	const char *zQ;
1337	1337	int go = P("go")!=0;
1338	1338	login_check_credentials();
1339	1339	if( !g.perm.Setup ){
1340	1340	login_needed(0);
		@@ -1469,11 +1469,11 @@
1469	1469	**
1470	1470	** Run raw TH1 commands using the web interface. If Tcl integration was
1471	1471	** enabled at compile-time and the "tcl" setting is enabled, Tcl commands
1472	1472	** may be run as well. Requires Admin privilege.
1473	1473	*/
1474		-void th1_page(void){
	1474	+void admin_th1_page(void){
1475	1475	const char *zQ = P("q");
1476	1476	int go = P("go")!=0;
1477	1477	login_check_credentials();
1478	1478	if( !g.perm.Setup ){
1479	1479	login_needed(0);
		@@ -1512,11 +1512,11 @@
1512	1512	**
1513	1513	** Shows the contents of the admin_log table, which is only created if
1514	1514	** the admin-log setting is enabled. Requires Admin or Setup ('a' or
1515	1515	** 's') permissions.
1516	1516	*/
1517		-void page_admin_log(){
	1517	+void admin_log_page(){
1518	1518	Stmt stLog;
1519	1519	int limit; /* How many entries to show */
1520	1520	int ofst; /* Offset to the first entry */
1521	1521	int fLogEnabled;
1522	1522	int counter = 0;
		@@ -1577,11 +1577,11 @@
1577	1577	/*
1578	1578	** WEBPAGE: srchsetup
1579	1579	**
1580	1580	** Configure the search engine. Requires Admin privilege.
1581	1581	*/
1582		-void page_srchsetup(){
	1582	+void srchsetup_page(){
1583	1583	login_check_credentials();
1584	1584	if( !g.perm.Admin ){
1585	1585	login_needed(0);
1586	1586	return;
1587	1587	}
		@@ -1699,11 +1699,11 @@
1699	1699	/*
1700	1700	** WEBPAGE: waliassetup
1701	1701	**
1702	1702	** Configure the URL aliases
1703	1703	*/
1704		-void page_waliassetup(){
	1704	+void waliassetup_page(){
1705	1705	Stmt q;
1706	1706	int cnt = 0;
1707	1707	Blob namelist;
1708	1708	login_check_credentials();
1709	1709	if( !g.perm.Admin ){
1710	1710

	--- src/setup.c
	+++ src/setup.c
	@@ -311,11 +311,11 @@
311	/*
312	** WEBPAGE: setup_access
313	**
314	** The access-control settings page. Requires Setup privileges.
315	*/
316	void setup_access(void){
317	static const char *const azRedirectOpts[] = {
318	"0", "Off",
319	"1", "Login Page Only",
320	"2", "All Pages"
321	};
	@@ -542,11 +542,11 @@
542	** WEBPAGE: setup_login_group
543	**
544	** Change how the current repository participates in a login
545	** group.
546	*/
547	void setup_login_group(void){
548	const char *zGroup;
549	char *zErrMsg = 0;
550	Blob fullName;
551	char *zSelfRepo;
552	const char *zRepo = PD("repo", "");
	@@ -665,11 +665,11 @@
665	** WEBPAGE: setup_timeline
666	**
667	** Edit administrative settings controlling the display of
668	** timelines.
669	*/
670	void setup_timeline(void){
671	double tmDiff;
672	char zTmDiff[20];
673	static const char *const azTimeFormats[] = {
674	"0", "HH:MM",
675	"1", "HH:MM:SS",
	@@ -804,11 +804,11 @@
804	** WEBPAGE: setup_settings
805	**
806	** Change or view miscellaneous settings. Part of the
807	** /setup pages requiring Setup privileges.
808	*/
809	void setup_settings(void){
810	int nSetting;
811	int i;
812	Setting const *pSet;
813	const Setting *aSetting = setting_info(&nSetting);
814
	@@ -891,11 +891,11 @@
891	/*
892	** WEBPAGE: setup_config
893	**
894	** The "Admin/Configuration" page. Requires Setup privilege.
895	*/
896	void setup_config(void){
897	login_check_credentials();
898	if( !g.perm.Setup ){
899	login_needed(0);
900	return;
901	}
	@@ -987,11 +987,11 @@
987	/*
988	** WEBPAGE: setup_wiki
989	**
990	** The "Admin/Wiki" page. Requires Setup privilege.
991	*/
992	void setup_wiki(void){
993	login_check_credentials();
994	if( !g.perm.Setup ){
995	login_needed(0);
996	return;
997	}
	@@ -1047,11 +1047,11 @@
1047	/*
1048	** WEBPAGE: setup_modreq
1049	**
1050	** Admin page for setting up moderation of tickets and wiki.
1051	*/
1052	void setup_modreq(void){
1053	login_check_credentials();
1054	if( !g.perm.Admin ){
1055	login_needed(0);
1056	return;
1057	}
	@@ -1095,11 +1095,11 @@
1095	** WEBPAGE: setup_adunit
1096	**
1097	** Administrative page for configuring and controlling ad units
1098	** and how they are displayed.
1099	*/
1100	void setup_adunit(void){
1101	login_check_credentials();
1102	if( !g.perm.Admin ){
1103	login_needed(0);
1104	return;
1105	}
	@@ -1171,11 +1171,11 @@
1171	/*
1172	** WEBPAGE: setup_logo
1173	**
1174	** Administrative page for changing the logo image.
1175	*/
1176	void setup_logo(void){
1177	const char *zLogoMtime = db_get_mtime("logo-image", 0, 0);
1178	const char *zLogoMime = db_get("logo-mimetype","image/gif");
1179	const char *aLogoImg = P("logoim");
1180	int szLogoImg = atoi(PD("logoim:bytes","0"));
1181	const char *zBgMtime = db_get_mtime("background-image", 0, 0);
	@@ -1330,11 +1330,11 @@
1330	** WEBPAGE: admin_sql
1331	**
1332	** Run raw SQL commands against the database file using the web interface.
1333	** Requires Setup privileges.
1334	*/
1335	void sql_page(void){
1336	const char *zQ;
1337	int go = P("go")!=0;
1338	login_check_credentials();
1339	if( !g.perm.Setup ){
1340	login_needed(0);
	@@ -1469,11 +1469,11 @@
1469	**
1470	** Run raw TH1 commands using the web interface. If Tcl integration was
1471	** enabled at compile-time and the "tcl" setting is enabled, Tcl commands
1472	** may be run as well. Requires Admin privilege.
1473	*/
1474	void th1_page(void){
1475	const char *zQ = P("q");
1476	int go = P("go")!=0;
1477	login_check_credentials();
1478	if( !g.perm.Setup ){
1479	login_needed(0);
	@@ -1512,11 +1512,11 @@
1512	**
1513	** Shows the contents of the admin_log table, which is only created if
1514	** the admin-log setting is enabled. Requires Admin or Setup ('a' or
1515	** 's') permissions.
1516	*/
1517	void page_admin_log(){
1518	Stmt stLog;
1519	int limit; /* How many entries to show */
1520	int ofst; /* Offset to the first entry */
1521	int fLogEnabled;
1522	int counter = 0;
	@@ -1577,11 +1577,11 @@
1577	/*
1578	** WEBPAGE: srchsetup
1579	**
1580	** Configure the search engine. Requires Admin privilege.
1581	*/
1582	void page_srchsetup(){
1583	login_check_credentials();
1584	if( !g.perm.Admin ){
1585	login_needed(0);
1586	return;
1587	}
	@@ -1699,11 +1699,11 @@
1699	/*
1700	** WEBPAGE: waliassetup
1701	**
1702	** Configure the URL aliases
1703	*/
1704	void page_waliassetup(){
1705	Stmt q;
1706	int cnt = 0;
1707	Blob namelist;
1708	login_check_credentials();
1709	if( !g.perm.Admin ){
1710

	--- src/setup.c
	+++ src/setup.c
	@@ -311,11 +311,11 @@
311	/*
312	** WEBPAGE: setup_access
313	**
314	** The access-control settings page. Requires Setup privileges.
315	*/
316	void setup_access_page(void){
317	static const char *const azRedirectOpts[] = {
318	"0", "Off",
319	"1", "Login Page Only",
320	"2", "All Pages"
321	};
	@@ -542,11 +542,11 @@
542	** WEBPAGE: setup_login_group
543	**
544	** Change how the current repository participates in a login
545	** group.
546	*/
547	void setup_login_group_page(void){
548	const char *zGroup;
549	char *zErrMsg = 0;
550	Blob fullName;
551	char *zSelfRepo;
552	const char *zRepo = PD("repo", "");
	@@ -665,11 +665,11 @@
665	** WEBPAGE: setup_timeline
666	**
667	** Edit administrative settings controlling the display of
668	** timelines.
669	*/
670	void setup_timeline_page(void){
671	double tmDiff;
672	char zTmDiff[20];
673	static const char *const azTimeFormats[] = {
674	"0", "HH:MM",
675	"1", "HH:MM:SS",
	@@ -804,11 +804,11 @@
804	** WEBPAGE: setup_settings
805	**
806	** Change or view miscellaneous settings. Part of the
807	** /setup pages requiring Setup privileges.
808	*/
809	void setup_settings_page(void){
810	int nSetting;
811	int i;
812	Setting const *pSet;
813	const Setting *aSetting = setting_info(&nSetting);
814
	@@ -891,11 +891,11 @@
891	/*
892	** WEBPAGE: setup_config
893	**
894	** The "Admin/Configuration" page. Requires Setup privilege.
895	*/
896	void setup_config_page(void){
897	login_check_credentials();
898	if( !g.perm.Setup ){
899	login_needed(0);
900	return;
901	}
	@@ -987,11 +987,11 @@
987	/*
988	** WEBPAGE: setup_wiki
989	**
990	** The "Admin/Wiki" page. Requires Setup privilege.
991	*/
992	void setup_wiki_page(void){
993	login_check_credentials();
994	if( !g.perm.Setup ){
995	login_needed(0);
996	return;
997	}
	@@ -1047,11 +1047,11 @@
1047	/*
1048	** WEBPAGE: setup_modreq
1049	**
1050	** Admin page for setting up moderation of tickets and wiki.
1051	*/
1052	void setup_modreq_page(void){
1053	login_check_credentials();
1054	if( !g.perm.Admin ){
1055	login_needed(0);
1056	return;
1057	}
	@@ -1095,11 +1095,11 @@
1095	** WEBPAGE: setup_adunit
1096	**
1097	** Administrative page for configuring and controlling ad units
1098	** and how they are displayed.
1099	*/
1100	void setup_adunit_page(void){
1101	login_check_credentials();
1102	if( !g.perm.Admin ){
1103	login_needed(0);
1104	return;
1105	}
	@@ -1171,11 +1171,11 @@
1171	/*
1172	** WEBPAGE: setup_logo
1173	**
1174	** Administrative page for changing the logo image.
1175	*/
1176	void setup_logo_page(void){
1177	const char *zLogoMtime = db_get_mtime("logo-image", 0, 0);
1178	const char *zLogoMime = db_get("logo-mimetype","image/gif");
1179	const char *aLogoImg = P("logoim");
1180	int szLogoImg = atoi(PD("logoim:bytes","0"));
1181	const char *zBgMtime = db_get_mtime("background-image", 0, 0);
	@@ -1330,11 +1330,11 @@
1330	** WEBPAGE: admin_sql
1331	**
1332	** Run raw SQL commands against the database file using the web interface.
1333	** Requires Setup privileges.
1334	*/
1335	void admin_sql_page(void){
1336	const char *zQ;
1337	int go = P("go")!=0;
1338	login_check_credentials();
1339	if( !g.perm.Setup ){
1340	login_needed(0);
	@@ -1469,11 +1469,11 @@
1469	**
1470	** Run raw TH1 commands using the web interface. If Tcl integration was
1471	** enabled at compile-time and the "tcl" setting is enabled, Tcl commands
1472	** may be run as well. Requires Admin privilege.
1473	*/
1474	void admin_th1_page(void){
1475	const char *zQ = P("q");
1476	int go = P("go")!=0;
1477	login_check_credentials();
1478	if( !g.perm.Setup ){
1479	login_needed(0);
	@@ -1512,11 +1512,11 @@
1512	**
1513	** Shows the contents of the admin_log table, which is only created if
1514	** the admin-log setting is enabled. Requires Admin or Setup ('a' or
1515	** 's') permissions.
1516	*/
1517	void admin_log_page(){
1518	Stmt stLog;
1519	int limit; /* How many entries to show */
1520	int ofst; /* Offset to the first entry */
1521	int fLogEnabled;
1522	int counter = 0;
	@@ -1577,11 +1577,11 @@
1577	/*
1578	** WEBPAGE: srchsetup
1579	**
1580	** Configure the search engine. Requires Admin privilege.
1581	*/
1582	void srchsetup_page(){
1583	login_check_credentials();
1584	if( !g.perm.Admin ){
1585	login_needed(0);
1586	return;
1587	}
	@@ -1699,11 +1699,11 @@
1699	/*
1700	** WEBPAGE: waliassetup
1701	**
1702	** Configure the URL aliases
1703	*/
1704	void waliassetup_page(){
1705	Stmt q;
1706	int cnt = 0;
1707	Blob namelist;
1708	login_check_credentials();
1709	if( !g.perm.Admin ){
1710

M src/setupuser.c

+4 -4

		--- src/setupuser.c
		+++ src/setupuser.c
		@@ -31,11 +31,11 @@
31	31	**
32	32	** Query parameters:
33	33	**
34	34	** with=CAP Only show users that have one or more capabilities in CAP.
35	35	*/
36		-void setup_ulist(void){
	36	+void setup_ulist_page(void){
37	37	Stmt s;
38	38	double rNow;
39	39	const char *zWith = P("with");
40	40	int bUnusedOnly = P("unused")!=0;
41	41
		@@ -190,11 +190,11 @@
190	190	**
191	191	** A documentation page showing notes about user configuration. This
192	192	** information used to be a side-bar on the user list page, but has been
193	193	** factored out for improved presentation.
194	194	*/
195		-void setup_ulist_notes(void){
	195	+void setup_ulist_notes_page(void){
196	196	style_header("User Configuration Notes");
197	197	@ <h1>User Configuration Notes:</h1>
198	198	@ <ol>
199	199	@ <li><p>
200	200	@ Every user, logged in or not, inherits the privileges of
		@@ -235,11 +235,11 @@
235	235	** WEBPAGE: setup_ucap_list
236	236	**
237	237	** A documentation page showing the meaning of the various user capabilities
238	238	** code letters.
239	239	*/
240		-void setup_ucap_list(void){
	240	+void setup_ucap_list_page(void){
241	241	style_header("User Capability Codes");
242	242	@ <h1>All capabilities</h1>
243	243	capabilities_table(CAPCLASS_ALL);
244	244	@ <h1>Capabilities associated with checked-in content</h1>
245	245	capabilities_table(CAPCLASS_CODE);
		@@ -276,11 +276,11 @@
276	276	** WEBPAGE: setup_uedit
277	277	**
278	278	** Edit information about a user or create a new user.
279	279	** Requires Admin privileges.
280	280	*/
281		-void user_edit(void){
	281	+void setup_uedit_page(void){
282	282	const char zId, zLogin, zInfo, zCap, *zPw;
283	283	const char *zGroup;
284	284	const char *zOldLogin;
285	285	int uid, i;
286	286	char zDeleteVerify = 0; / Delete user verification text */
287	287

	--- src/setupuser.c
	+++ src/setupuser.c
	@@ -31,11 +31,11 @@
31	**
32	** Query parameters:
33	**
34	** with=CAP Only show users that have one or more capabilities in CAP.
35	*/
36	void setup_ulist(void){
37	Stmt s;
38	double rNow;
39	const char *zWith = P("with");
40	int bUnusedOnly = P("unused")!=0;
41
	@@ -190,11 +190,11 @@
190	**
191	** A documentation page showing notes about user configuration. This
192	** information used to be a side-bar on the user list page, but has been
193	** factored out for improved presentation.
194	*/
195	void setup_ulist_notes(void){
196	style_header("User Configuration Notes");
197	@ <h1>User Configuration Notes:</h1>
198	@ <ol>
199	@ <li><p>
200	@ Every user, logged in or not, inherits the privileges of
	@@ -235,11 +235,11 @@
235	** WEBPAGE: setup_ucap_list
236	**
237	** A documentation page showing the meaning of the various user capabilities
238	** code letters.
239	*/
240	void setup_ucap_list(void){
241	style_header("User Capability Codes");
242	@ <h1>All capabilities</h1>
243	capabilities_table(CAPCLASS_ALL);
244	@ <h1>Capabilities associated with checked-in content</h1>
245	capabilities_table(CAPCLASS_CODE);
	@@ -276,11 +276,11 @@
276	** WEBPAGE: setup_uedit
277	**
278	** Edit information about a user or create a new user.
279	** Requires Admin privileges.
280	*/
281	void user_edit(void){
282	const char zId, zLogin, zInfo, zCap, *zPw;
283	const char *zGroup;
284	const char *zOldLogin;
285	int uid, i;
286	char zDeleteVerify = 0; / Delete user verification text */
287

	--- src/setupuser.c
	+++ src/setupuser.c
	@@ -31,11 +31,11 @@
31	**
32	** Query parameters:
33	**
34	** with=CAP Only show users that have one or more capabilities in CAP.
35	*/
36	void setup_ulist_page(void){
37	Stmt s;
38	double rNow;
39	const char *zWith = P("with");
40	int bUnusedOnly = P("unused")!=0;
41
	@@ -190,11 +190,11 @@
190	**
191	** A documentation page showing notes about user configuration. This
192	** information used to be a side-bar on the user list page, but has been
193	** factored out for improved presentation.
194	*/
195	void setup_ulist_notes_page(void){
196	style_header("User Configuration Notes");
197	@ <h1>User Configuration Notes:</h1>
198	@ <ol>
199	@ <li><p>
200	@ Every user, logged in or not, inherits the privileges of
	@@ -235,11 +235,11 @@
235	** WEBPAGE: setup_ucap_list
236	**
237	** A documentation page showing the meaning of the various user capabilities
238	** code letters.
239	*/
240	void setup_ucap_list_page(void){
241	style_header("User Capability Codes");
242	@ <h1>All capabilities</h1>
243	capabilities_table(CAPCLASS_ALL);
244	@ <h1>Capabilities associated with checked-in content</h1>
245	capabilities_table(CAPCLASS_CODE);
	@@ -276,11 +276,11 @@
276	** WEBPAGE: setup_uedit
277	**
278	** Edit information about a user or create a new user.
279	** Requires Admin privileges.
280	*/
281	void setup_uedit_page(void){
282	const char zId, zLogin, zInfo, zCap, *zPw;
283	const char *zGroup;
284	const char *zOldLogin;
285	int uid, i;
286	char zDeleteVerify = 0; / Delete user verification text */
287

M src/sha1.c

+1 -1

		--- src/sha1.c
		+++ src/sha1.c
		@@ -508,11 +508,11 @@
508	508	** -h, --dereference If FILE is a symbolic link, compute the hash
509	509	** on the object that the link points to. Normally,
510	510	** the hash is over the name of the object that
511	511	** the link points to.
512	512	*/
513		-void sha1sum_test(void){
	513	+void sha1sum_cmd(void){
514	514	int i;
515	515	Blob in;
516	516	Blob cksum;
517	517	int eFType = SymFILE;
518	518	if( find_option("dereference","h",0)!=0 ){
519	519

	--- src/sha1.c
	+++ src/sha1.c
	@@ -508,11 +508,11 @@
508	** -h, --dereference If FILE is a symbolic link, compute the hash
509	** on the object that the link points to. Normally,
510	** the hash is over the name of the object that
511	** the link points to.
512	*/
513	void sha1sum_test(void){
514	int i;
515	Blob in;
516	Blob cksum;
517	int eFType = SymFILE;
518	if( find_option("dereference","h",0)!=0 ){
519

	--- src/sha1.c
	+++ src/sha1.c
	@@ -508,11 +508,11 @@
508	** -h, --dereference If FILE is a symbolic link, compute the hash
509	** on the object that the link points to. Normally,
510	** the hash is over the name of the object that
511	** the link points to.
512	*/
513	void sha1sum_cmd(void){
514	int i;
515	Blob in;
516	Blob cksum;
517	int eFType = SymFILE;
518	if( find_option("dereference","h",0)!=0 ){
519

M src/sha3.c

+1 -1

		--- src/sha3.c
		+++ src/sha3.c
		@@ -638,11 +638,11 @@
638	638	** --size N An N-bit hash. N must be a multiple of 32 between
639	639	** 128 and 512.
640	640	** -h, --dereference If FILE is a symbolic link, compute the hash on
641	641	** the object pointed to, not on the link itself.
642	642	*/
643		-void sha3sum_test(void){
	643	+void sha3sum_cmd(void){
644	644	int i;
645	645	Blob in;
646	646	Blob cksum;
647	647	int iSize = 256;
648	648	int eFType = SymFILE;
649	649

	--- src/sha3.c
	+++ src/sha3.c
	@@ -638,11 +638,11 @@
638	** --size N An N-bit hash. N must be a multiple of 32 between
639	** 128 and 512.
640	** -h, --dereference If FILE is a symbolic link, compute the hash on
641	** the object pointed to, not on the link itself.
642	*/
643	void sha3sum_test(void){
644	int i;
645	Blob in;
646	Blob cksum;
647	int iSize = 256;
648	int eFType = SymFILE;
649

	--- src/sha3.c
	+++ src/sha3.c
	@@ -638,11 +638,11 @@
638	** --size N An N-bit hash. N must be a multiple of 32 between
639	** 128 and 512.
640	** -h, --dereference If FILE is a symbolic link, compute the hash on
641	** the object pointed to, not on the link itself.
642	*/
643	void sha3sum_cmd(void){
644	int i;
645	Blob in;
646	Blob cksum;
647	int iSize = 256;
648	int eFType = SymFILE;
649

M src/skins.c

+3 -3

		--- src/skins.c
		+++ src/skins.c
		@@ -448,11 +448,11 @@
448	448	/*
449	449	** WEBPAGE: setup_skin_admin
450	450	**
451	451	** Administrative actions on skins. For administrators only.
452	452	*/
453		-void setup_skin_admin(void){
	453	+void setup_skin_admin_page(void){
454	454	const char *z;
455	455	char *zName;
456	456	char *zErr = 0;
457	457	const char zCurrent = 0; / Current skin */
458	458	int i; /* Loop counter */
		@@ -698,11 +698,11 @@
698	698	** Requires Admin or Setup privileges.
699	699	**
700	700	** w=NUM -- 0=CSS, 1=footer, 2=header, 3=details, 4=js
701	701	** sk=NUM -- the draft skin number
702	702	*/
703		-void setup_skinedit(void){
	703	+void setup_skinedit_page(void){
704	704	static const struct sSkinAddr {
705	705	const char *zFile;
706	706	const char *zTitle;
707	707	const char *zSubmenu;
708	708	} aSkinAttr[] = {
		@@ -874,11 +874,11 @@
874	874	/*
875	875	** WEBPAGE: setup_skin
876	876	**
877	877	** Generate a page showing the steps needed to customize a skin.
878	878	*/
879		-void setup_skin(void){
	879	+void setup_skin_page(void){
880	880	int i; /* Loop counter */
881	881	int iSkin; /* Which draft skin is being edited */
882	882	int isSetup; /* True for an administrator */
883	883	int isEditor; /* Others authorized to make edits */
884	884	char zAllowedEditors; / Who may edit the draft skin */
885	885

	--- src/skins.c
	+++ src/skins.c
	@@ -448,11 +448,11 @@
448	/*
449	** WEBPAGE: setup_skin_admin
450	**
451	** Administrative actions on skins. For administrators only.
452	*/
453	void setup_skin_admin(void){
454	const char *z;
455	char *zName;
456	char *zErr = 0;
457	const char zCurrent = 0; / Current skin */
458	int i; /* Loop counter */
	@@ -698,11 +698,11 @@
698	** Requires Admin or Setup privileges.
699	**
700	** w=NUM -- 0=CSS, 1=footer, 2=header, 3=details, 4=js
701	** sk=NUM -- the draft skin number
702	*/
703	void setup_skinedit(void){
704	static const struct sSkinAddr {
705	const char *zFile;
706	const char *zTitle;
707	const char *zSubmenu;
708	} aSkinAttr[] = {
	@@ -874,11 +874,11 @@
874	/*
875	** WEBPAGE: setup_skin
876	**
877	** Generate a page showing the steps needed to customize a skin.
878	*/
879	void setup_skin(void){
880	int i; /* Loop counter */
881	int iSkin; /* Which draft skin is being edited */
882	int isSetup; /* True for an administrator */
883	int isEditor; /* Others authorized to make edits */
884	char zAllowedEditors; / Who may edit the draft skin */
885

	--- src/skins.c
	+++ src/skins.c
	@@ -448,11 +448,11 @@
448	/*
449	** WEBPAGE: setup_skin_admin
450	**
451	** Administrative actions on skins. For administrators only.
452	*/
453	void setup_skin_admin_page(void){
454	const char *z;
455	char *zName;
456	char *zErr = 0;
457	const char zCurrent = 0; / Current skin */
458	int i; /* Loop counter */
	@@ -698,11 +698,11 @@
698	** Requires Admin or Setup privileges.
699	**
700	** w=NUM -- 0=CSS, 1=footer, 2=header, 3=details, 4=js
701	** sk=NUM -- the draft skin number
702	*/
703	void setup_skinedit_page(void){
704	static const struct sSkinAddr {
705	const char *zFile;
706	const char *zTitle;
707	const char *zSubmenu;
708	} aSkinAttr[] = {
	@@ -874,11 +874,11 @@
874	/*
875	** WEBPAGE: setup_skin
876	**
877	** Generate a page showing the steps needed to customize a skin.
878	*/
879	void setup_skin_page(void){
880	int i; /* Loop counter */
881	int iSkin; /* Which draft skin is being edited */
882	int isSetup; /* True for an administrator */
883	int isEditor; /* Others authorized to make edits */
884	char zAllowedEditors; / Who may edit the draft skin */
885

M src/smtp.c

+9 -9

		--- src/smtp.c
		+++ src/smtp.c
		@@ -133,11 +133,11 @@
133	133	** Usage: %fossil test-find-mx DOMAIN ...
134	134	**
135	135	** Do a DNS MX lookup to find the hostname for sending email for
136	136	** DOMAIN.
137	137	*/
138		-void test_find_mx(void){
	138	+void test_find_mx_cmd(void){
139	139	int i;
140	140	if( g.argc<=2 ){
141	141	usage("DOMAIN ...");
142	142	}
143	143	for(i=2; i<g.argc; i++){
		@@ -427,11 +427,11 @@
427	427	** Options:
428	428	**
429	429	** --direct Use DOMAIN directly without going through MX
430	430	** --port N Talk on TCP port N
431	431	*/
432		-void test_smtp_probe(void){
	432	+void test_smtp_probe_cmd(void){
433	433	SmtpSession *p;
434	434	const char *zDomain;
435	435	const char *zSelf;
436	436	const char *zPort;
437	437	int iPort = 25;
		@@ -507,11 +507,11 @@
507	507	**
508	508	** Read content from FILE, then send it to stdout encoded as if sent
509	509	** to the DATA portion of an SMTP session. This command is used to
510	510	** test the encoding logic.
511	511	*/
512		-void test_smtp_senddata(void){
	512	+void test_smtp_senddata_cmd(void){
513	513	Blob f;
514	514	if( g.argc!=3 ) usage("FILE");
515	515	blob_read_from_file(&f, g.argv[2], ExtFILE);
516	516	smtp_send_email_body(blob_str(&f), smtp_test_sender, 0);
517	517	blob_reset(&f);
		@@ -602,11 +602,11 @@
602	602	** --direct Go directly to the TO domain. Bypass MX lookup
603	603	** --relayhost R Use R as relay host directly for delivery.
604	604	** --port N Use TCP port N instead of 25
605	605	** --trace Show the SMTP conversation on the console
606	606	*/
607		-void test_smtp_send(void){
	607	+void test_smtp_send_cmd(void){
608	608	SmtpSession *p;
609	609	const char *zFrom;
610	610	int nTo;
611	611	const char *zToDomain;
612	612	const char *zFromDomain;
		@@ -761,11 +761,11 @@
761	761	**
762	762	** Administrative page for configuring and controlling inbound email and
763	763	** output email queuing. This page is available to administrators
764	764	** only via the /Admin/EmailServer menu.
765	765	*/
766		-void setup_smtp(void){
	766	+void setup_smtp_page(void){
767	767	Stmt q;
768	768	login_check_credentials();
769	769	if( !g.perm.Setup ){
770	770	login_needed(0);
771	771	return;
		@@ -822,11 +822,11 @@
822	822	** oaddr=ADDR The original email address prior to editing.
823	823	** Omit to add a new address.
824	824	**
825	825	** epolicy=TXT The routing policy.
826	826	*/
827		-void setup_smtp_route(void){
	827	+void setup_smtp_route_page(void){
828	828	char zEAddr = PT("eaddr"); / new email address */
829	829	char zEPolicy = PT("epolicy"); / new routing policy */
830	830	char zOAddr = PT("oaddr"); / original email address */
831	831	char *zErr = 0;
832	832	int iErr = 0;
		@@ -1258,11 +1258,11 @@
1258	1258	** Use the --repair command to fix up the enref field. The --full option
1259	1259	** gives a full report showing the enref value on all entries in the
1260	1260	** emailblob table. If the --clean flags is used together with --repair,
1261	1261	** then emailblob table entires with enref==0 are removed.
1262	1262	*/
1263		-void test_refcheck_emailblob(void){
	1263	+void test_emailblob_refcheck_cmd(void){
1264	1264	int doRepair;
1265	1265	int fullReport;
1266	1266	int doClean;
1267	1267	Blob sql;
1268	1268	Stmt q;
		@@ -1336,11 +1336,11 @@
1336	1336	**
1337	1337	** --ipaddr ADDR The SMTP connection originates at ADDR. Or if ADDR
1338	1338	** is the name of an environment variable, the address
1339	1339	** is taken from that environment variable.
1340	1340	*/
1341		-void smtp_server(void){
	1341	+void smtp_server_cmd(void){
1342	1342	char *zDbName;
1343	1343	const char *zDomain;
1344	1344	SmtpServer x;
1345	1345	char z[5000];
1346	1346
		@@ -1482,11 +1482,11 @@
1482	1482	** --logdir DIR Each pop3d session creates a new logfile
1483	1483	** in the directory DIR and records a transcript
1484	1484	** of the session there. The logfile is opened
1485	1485	** before entering the chroot jail.
1486	1486	*/
1487		-void pop3d_command(void){
	1487	+void pop3d_cmd(void){
1488	1488	char *zDbName;
1489	1489	char zA1, zA2, zCmd, z;
1490	1490	int inAuth = 1;
1491	1491	int i;
1492	1492	FILE *pLog = 0;
1493	1493

	--- src/smtp.c
	+++ src/smtp.c
	@@ -133,11 +133,11 @@
133	** Usage: %fossil test-find-mx DOMAIN ...
134	**
135	** Do a DNS MX lookup to find the hostname for sending email for
136	** DOMAIN.
137	*/
138	void test_find_mx(void){
139	int i;
140	if( g.argc<=2 ){
141	usage("DOMAIN ...");
142	}
143	for(i=2; i<g.argc; i++){
	@@ -427,11 +427,11 @@
427	** Options:
428	**
429	** --direct Use DOMAIN directly without going through MX
430	** --port N Talk on TCP port N
431	*/
432	void test_smtp_probe(void){
433	SmtpSession *p;
434	const char *zDomain;
435	const char *zSelf;
436	const char *zPort;
437	int iPort = 25;
	@@ -507,11 +507,11 @@
507	**
508	** Read content from FILE, then send it to stdout encoded as if sent
509	** to the DATA portion of an SMTP session. This command is used to
510	** test the encoding logic.
511	*/
512	void test_smtp_senddata(void){
513	Blob f;
514	if( g.argc!=3 ) usage("FILE");
515	blob_read_from_file(&f, g.argv[2], ExtFILE);
516	smtp_send_email_body(blob_str(&f), smtp_test_sender, 0);
517	blob_reset(&f);
	@@ -602,11 +602,11 @@
602	** --direct Go directly to the TO domain. Bypass MX lookup
603	** --relayhost R Use R as relay host directly for delivery.
604	** --port N Use TCP port N instead of 25
605	** --trace Show the SMTP conversation on the console
606	*/
607	void test_smtp_send(void){
608	SmtpSession *p;
609	const char *zFrom;
610	int nTo;
611	const char *zToDomain;
612	const char *zFromDomain;
	@@ -761,11 +761,11 @@
761	**
762	** Administrative page for configuring and controlling inbound email and
763	** output email queuing. This page is available to administrators
764	** only via the /Admin/EmailServer menu.
765	*/
766	void setup_smtp(void){
767	Stmt q;
768	login_check_credentials();
769	if( !g.perm.Setup ){
770	login_needed(0);
771	return;
	@@ -822,11 +822,11 @@
822	** oaddr=ADDR The original email address prior to editing.
823	** Omit to add a new address.
824	**
825	** epolicy=TXT The routing policy.
826	*/
827	void setup_smtp_route(void){
828	char zEAddr = PT("eaddr"); / new email address */
829	char zEPolicy = PT("epolicy"); / new routing policy */
830	char zOAddr = PT("oaddr"); / original email address */
831	char *zErr = 0;
832	int iErr = 0;
	@@ -1258,11 +1258,11 @@
1258	** Use the --repair command to fix up the enref field. The --full option
1259	** gives a full report showing the enref value on all entries in the
1260	** emailblob table. If the --clean flags is used together with --repair,
1261	** then emailblob table entires with enref==0 are removed.
1262	*/
1263	void test_refcheck_emailblob(void){
1264	int doRepair;
1265	int fullReport;
1266	int doClean;
1267	Blob sql;
1268	Stmt q;
	@@ -1336,11 +1336,11 @@
1336	**
1337	** --ipaddr ADDR The SMTP connection originates at ADDR. Or if ADDR
1338	** is the name of an environment variable, the address
1339	** is taken from that environment variable.
1340	*/
1341	void smtp_server(void){
1342	char *zDbName;
1343	const char *zDomain;
1344	SmtpServer x;
1345	char z[5000];
1346
	@@ -1482,11 +1482,11 @@
1482	** --logdir DIR Each pop3d session creates a new logfile
1483	** in the directory DIR and records a transcript
1484	** of the session there. The logfile is opened
1485	** before entering the chroot jail.
1486	*/
1487	void pop3d_command(void){
1488	char *zDbName;
1489	char zA1, zA2, zCmd, z;
1490	int inAuth = 1;
1491	int i;
1492	FILE *pLog = 0;
1493

	--- src/smtp.c
	+++ src/smtp.c
	@@ -133,11 +133,11 @@
133	** Usage: %fossil test-find-mx DOMAIN ...
134	**
135	** Do a DNS MX lookup to find the hostname for sending email for
136	** DOMAIN.
137	*/
138	void test_find_mx_cmd(void){
139	int i;
140	if( g.argc<=2 ){
141	usage("DOMAIN ...");
142	}
143	for(i=2; i<g.argc; i++){
	@@ -427,11 +427,11 @@
427	** Options:
428	**
429	** --direct Use DOMAIN directly without going through MX
430	** --port N Talk on TCP port N
431	*/
432	void test_smtp_probe_cmd(void){
433	SmtpSession *p;
434	const char *zDomain;
435	const char *zSelf;
436	const char *zPort;
437	int iPort = 25;
	@@ -507,11 +507,11 @@
507	**
508	** Read content from FILE, then send it to stdout encoded as if sent
509	** to the DATA portion of an SMTP session. This command is used to
510	** test the encoding logic.
511	*/
512	void test_smtp_senddata_cmd(void){
513	Blob f;
514	if( g.argc!=3 ) usage("FILE");
515	blob_read_from_file(&f, g.argv[2], ExtFILE);
516	smtp_send_email_body(blob_str(&f), smtp_test_sender, 0);
517	blob_reset(&f);
	@@ -602,11 +602,11 @@
602	** --direct Go directly to the TO domain. Bypass MX lookup
603	** --relayhost R Use R as relay host directly for delivery.
604	** --port N Use TCP port N instead of 25
605	** --trace Show the SMTP conversation on the console
606	*/
607	void test_smtp_send_cmd(void){
608	SmtpSession *p;
609	const char *zFrom;
610	int nTo;
611	const char *zToDomain;
612	const char *zFromDomain;
	@@ -761,11 +761,11 @@
761	**
762	** Administrative page for configuring and controlling inbound email and
763	** output email queuing. This page is available to administrators
764	** only via the /Admin/EmailServer menu.
765	*/
766	void setup_smtp_page(void){
767	Stmt q;
768	login_check_credentials();
769	if( !g.perm.Setup ){
770	login_needed(0);
771	return;
	@@ -822,11 +822,11 @@
822	** oaddr=ADDR The original email address prior to editing.
823	** Omit to add a new address.
824	**
825	** epolicy=TXT The routing policy.
826	*/
827	void setup_smtp_route_page(void){
828	char zEAddr = PT("eaddr"); / new email address */
829	char zEPolicy = PT("epolicy"); / new routing policy */
830	char zOAddr = PT("oaddr"); / original email address */
831	char *zErr = 0;
832	int iErr = 0;
	@@ -1258,11 +1258,11 @@
1258	** Use the --repair command to fix up the enref field. The --full option
1259	** gives a full report showing the enref value on all entries in the
1260	** emailblob table. If the --clean flags is used together with --repair,
1261	** then emailblob table entires with enref==0 are removed.
1262	*/
1263	void test_emailblob_refcheck_cmd(void){
1264	int doRepair;
1265	int fullReport;
1266	int doClean;
1267	Blob sql;
1268	Stmt q;
	@@ -1336,11 +1336,11 @@
1336	**
1337	** --ipaddr ADDR The SMTP connection originates at ADDR. Or if ADDR
1338	** is the name of an environment variable, the address
1339	** is taken from that environment variable.
1340	*/
1341	void smtp_server_cmd(void){
1342	char *zDbName;
1343	const char *zDomain;
1344	SmtpServer x;
1345	char z[5000];
1346
	@@ -1482,11 +1482,11 @@
1482	** --logdir DIR Each pop3d session creates a new logfile
1483	** in the directory DIR and records a transcript
1484	** of the session there. The logfile is opened
1485	** before entering the chroot jail.
1486	*/
1487	void pop3d_cmd(void){
1488	char *zDbName;
1489	char zA1, zA2, zCmd, z;
1490	int inAuth = 1;
1491	int i;
1492	FILE *pLog = 0;
1493

M src/sqlcmd.c

+1 -1

		--- src/sqlcmd.c
		+++ src/sqlcmd.c
		@@ -315,11 +315,11 @@
315	315	** standard SQLite.
316	316	**
317	317	** symbolic_name_to_rid(X) Return the BLOB.RID corresponding to symbolic
318	318	** name X.
319	319	*/
320		-void cmd_sqlite3(void){
	320	+void sqlite3_cmd(void){
321	321	int noRepository;
322	322	char *zConfigDb;
323	323	extern int sqlite3_shell(int, char**);
324	324	#ifdef FOSSIL_ENABLE_TH1_HOOKS
325	325	g.fNoThHook = 1;
326	326

	--- src/sqlcmd.c
	+++ src/sqlcmd.c
	@@ -315,11 +315,11 @@
315	** standard SQLite.
316	**
317	** symbolic_name_to_rid(X) Return the BLOB.RID corresponding to symbolic
318	** name X.
319	*/
320	void cmd_sqlite3(void){
321	int noRepository;
322	char *zConfigDb;
323	extern int sqlite3_shell(int, char**);
324	#ifdef FOSSIL_ENABLE_TH1_HOOKS
325	g.fNoThHook = 1;
326

	--- src/sqlcmd.c
	+++ src/sqlcmd.c
	@@ -315,11 +315,11 @@
315	** standard SQLite.
316	**
317	** symbolic_name_to_rid(X) Return the BLOB.RID corresponding to symbolic
318	** name X.
319	*/
320	void sqlite3_cmd(void){
321	int noRepository;
322	char *zConfigDb;
323	extern int sqlite3_shell(int, char**);
324	#ifdef FOSSIL_ENABLE_TH1_HOOKS
325	g.fNoThHook = 1;
326

M src/statrep.c

+1 -1

		--- src/statrep.c
		+++ src/statrep.c
		@@ -735,11 +735,11 @@
735	735	** view=byweek:
736	736	**
737	737	** y=YYYY The year to report (default is the server's
738	738	** current year).
739	739	*/
740		-void stats_report_page(){
	740	+void reports_page(){
741	741	const char zView = P("view"); / Which view/report to show. */
742	742	int eType = RPT_NONE; /* Numeric code for view/report to show */
743	743	int i; /* Loop counter */
744	744	const char zUserName; / Name of user */
745	745	const char azView[16]; / Drop-down menu of view types */
746	746

	--- src/statrep.c
	+++ src/statrep.c
	@@ -735,11 +735,11 @@
735	** view=byweek:
736	**
737	** y=YYYY The year to report (default is the server's
738	** current year).
739	*/
740	void stats_report_page(){
741	const char zView = P("view"); / Which view/report to show. */
742	int eType = RPT_NONE; /* Numeric code for view/report to show */
743	int i; /* Loop counter */
744	const char zUserName; / Name of user */
745	const char azView[16]; / Drop-down menu of view types */
746

	--- src/statrep.c
	+++ src/statrep.c
	@@ -735,11 +735,11 @@
735	** view=byweek:
736	**
737	** y=YYYY The year to report (default is the server's
738	** current year).
739	*/
740	void reports_page(){
741	const char zView = P("view"); / Which view/report to show. */
742	int eType = RPT_NONE; /* Numeric code for view/report to show */
743	int i; /* Loop counter */
744	const char zUserName; / Name of user */
745	const char azView[16]; / Drop-down menu of view types */
746

M src/style.c

+5 -5

		--- src/style.c
		+++ src/style.c
		@@ -1014,11 +1014,11 @@
1014	1014	**
1015	1015	** Usage: %fossil test-contains-selector FILENAME SELECTOR
1016	1016	**
1017	1017	** Determine if the CSS stylesheet FILENAME contains SELECTOR.
1018	1018	*/
1019		-void contains_selector_cmd(void){
	1019	+void test_contains_selector_cmd(void){
1020	1020	int found;
1021	1021	char *zSelector;
1022	1022	Blob css;
1023	1023	if( g.argc!=4 ) usage("FILENAME SELECTOR");
1024	1024	blob_read_from_file(&css, g.argv[2], ExtFILE);
		@@ -1031,11 +1031,11 @@
1031	1031	/*
1032	1032	** WEBPAGE: script.js
1033	1033	**
1034	1034	** Return the "Javascript" content for the current skin (if there is any)
1035	1035	*/
1036		-void page_script_js(void){
	1036	+void script_js_page(void){
1037	1037	const char *zScript = skin_get("js");
1038	1038	if( P("test") ){
1039	1039	/* Render the script as plain-text for testing purposes, if the "test"
1040	1040	** query parameter is present */
1041	1041	cgi_set_content_type("text/plain");
		@@ -1051,11 +1051,11 @@
1051	1051	/*
1052	1052	** WEBPAGE: style.css
1053	1053	**
1054	1054	** Return the style sheet.
1055	1055	*/
1056		-void page_style_css(void){
	1056	+void style_css_page(void){
1057	1057	Blob css;
1058	1058	int i;
1059	1059	int isInit = 0;
1060	1060
1061	1061	cgi_set_content_type("text/css");
		@@ -1104,11 +1104,11 @@
1104	1104	** by many Fossil web pages to load built-in javascript files.
1105	1105	**
1106	1106	** If the id= query parameter is present, then Fossil assumes that the
1107	1107	** result is immutable and sets a very large cache retention time (1 year).
1108	1108	*/
1109		-void page_builtin_text(void){
	1109	+void builtin_page(void){
1110	1110	Blob out;
1111	1111	const char *zName = P("name");
1112	1112	const char *zTxt = 0;
1113	1113	const char *zId = P("id");
1114	1114	int nId;
		@@ -1170,11 +1170,11 @@
1170	1170	** WEBPAGE: test_env
1171	1171	**
1172	1172	** Display CGI-variables and other aspects of the run-time
1173	1173	** environment, for debugging and trouble-shooting purposes.
1174	1174	*/
1175		-void page_test_env(void){
	1175	+void test_env_page(void){
1176	1176	webpage_error("");
1177	1177	}
1178	1178
1179	1179	/*
1180	1180	** WEBPAGE: honeypot
1181	1181

	--- src/style.c
	+++ src/style.c
	@@ -1014,11 +1014,11 @@
1014	**
1015	** Usage: %fossil test-contains-selector FILENAME SELECTOR
1016	**
1017	** Determine if the CSS stylesheet FILENAME contains SELECTOR.
1018	*/
1019	void contains_selector_cmd(void){
1020	int found;
1021	char *zSelector;
1022	Blob css;
1023	if( g.argc!=4 ) usage("FILENAME SELECTOR");
1024	blob_read_from_file(&css, g.argv[2], ExtFILE);
	@@ -1031,11 +1031,11 @@
1031	/*
1032	** WEBPAGE: script.js
1033	**
1034	** Return the "Javascript" content for the current skin (if there is any)
1035	*/
1036	void page_script_js(void){
1037	const char *zScript = skin_get("js");
1038	if( P("test") ){
1039	/* Render the script as plain-text for testing purposes, if the "test"
1040	** query parameter is present */
1041	cgi_set_content_type("text/plain");
	@@ -1051,11 +1051,11 @@
1051	/*
1052	** WEBPAGE: style.css
1053	**
1054	** Return the style sheet.
1055	*/
1056	void page_style_css(void){
1057	Blob css;
1058	int i;
1059	int isInit = 0;
1060
1061	cgi_set_content_type("text/css");
	@@ -1104,11 +1104,11 @@
1104	** by many Fossil web pages to load built-in javascript files.
1105	**
1106	** If the id= query parameter is present, then Fossil assumes that the
1107	** result is immutable and sets a very large cache retention time (1 year).
1108	*/
1109	void page_builtin_text(void){
1110	Blob out;
1111	const char *zName = P("name");
1112	const char *zTxt = 0;
1113	const char *zId = P("id");
1114	int nId;
	@@ -1170,11 +1170,11 @@
1170	** WEBPAGE: test_env
1171	**
1172	** Display CGI-variables and other aspects of the run-time
1173	** environment, for debugging and trouble-shooting purposes.
1174	*/
1175	void page_test_env(void){
1176	webpage_error("");
1177	}
1178
1179	/*
1180	** WEBPAGE: honeypot
1181

	--- src/style.c
	+++ src/style.c
	@@ -1014,11 +1014,11 @@
1014	**
1015	** Usage: %fossil test-contains-selector FILENAME SELECTOR
1016	**
1017	** Determine if the CSS stylesheet FILENAME contains SELECTOR.
1018	*/
1019	void test_contains_selector_cmd(void){
1020	int found;
1021	char *zSelector;
1022	Blob css;
1023	if( g.argc!=4 ) usage("FILENAME SELECTOR");
1024	blob_read_from_file(&css, g.argv[2], ExtFILE);
	@@ -1031,11 +1031,11 @@
1031	/*
1032	** WEBPAGE: script.js
1033	**
1034	** Return the "Javascript" content for the current skin (if there is any)
1035	*/
1036	void script_js_page(void){
1037	const char *zScript = skin_get("js");
1038	if( P("test") ){
1039	/* Render the script as plain-text for testing purposes, if the "test"
1040	** query parameter is present */
1041	cgi_set_content_type("text/plain");
	@@ -1051,11 +1051,11 @@
1051	/*
1052	** WEBPAGE: style.css
1053	**
1054	** Return the style sheet.
1055	*/
1056	void style_css_page(void){
1057	Blob css;
1058	int i;
1059	int isInit = 0;
1060
1061	cgi_set_content_type("text/css");
	@@ -1104,11 +1104,11 @@
1104	** by many Fossil web pages to load built-in javascript files.
1105	**
1106	** If the id= query parameter is present, then Fossil assumes that the
1107	** result is immutable and sets a very large cache retention time (1 year).
1108	*/
1109	void builtin_page(void){
1110	Blob out;
1111	const char *zName = P("name");
1112	const char *zTxt = 0;
1113	const char *zId = P("id");
1114	int nId;
	@@ -1170,11 +1170,11 @@
1170	** WEBPAGE: test_env
1171	**
1172	** Display CGI-variables and other aspects of the run-time
1173	** environment, for debugging and trouble-shooting purposes.
1174	*/
1175	void test_env_page(void){
1176	webpage_error("");
1177	}
1178
1179	/*
1180	** WEBPAGE: honeypot
1181

M src/tag.c

+2 -2

		--- src/tag.c
		+++ src/tag.c
		@@ -250,11 +250,11 @@
250	250	** Add a tag or anti-tag to the rebuildable tables of the local repository.
251	251	** No tag artifact is created so the new tag is erased the next
252	252	** time the repository is rebuilt. This routine is for testing
253	253	** use only.
254	254	*/
255		-void testtag_cmd(void){
	255	+void test_tag_cmd(void){
256	256	const char *zTag;
257	257	const char *zValue;
258	258	int rid;
259	259	int tagtype;
260	260	db_must_be_within_tree();
		@@ -728,11 +728,11 @@
728	728	db_finalize(&q);
729	729	style_footer();
730	730	}
731	731
732	732	/*
733		-** WEBPAGE: /tagtimeline
	733	+** WEBPAGE: tagtimeline
734	734	**
735	735	** Render a timeline with all check-ins that contain non-propagating
736	736	** symbolic tags.
737	737	**
738	738	** Query parameters:
739	739

	--- src/tag.c
	+++ src/tag.c
	@@ -250,11 +250,11 @@
250	** Add a tag or anti-tag to the rebuildable tables of the local repository.
251	** No tag artifact is created so the new tag is erased the next
252	** time the repository is rebuilt. This routine is for testing
253	** use only.
254	*/
255	void testtag_cmd(void){
256	const char *zTag;
257	const char *zValue;
258	int rid;
259	int tagtype;
260	db_must_be_within_tree();
	@@ -728,11 +728,11 @@
728	db_finalize(&q);
729	style_footer();
730	}
731
732	/*
733	** WEBPAGE: /tagtimeline
734	**
735	** Render a timeline with all check-ins that contain non-propagating
736	** symbolic tags.
737	**
738	** Query parameters:
739

	--- src/tag.c
	+++ src/tag.c
	@@ -250,11 +250,11 @@
250	** Add a tag or anti-tag to the rebuildable tables of the local repository.
251	** No tag artifact is created so the new tag is erased the next
252	** time the repository is rebuilt. This routine is for testing
253	** use only.
254	*/
255	void test_tag_cmd(void){
256	const char *zTag;
257	const char *zValue;
258	int rid;
259	int tagtype;
260	db_must_be_within_tree();
	@@ -728,11 +728,11 @@
728	db_finalize(&q);
729	style_footer();
730	}
731
732	/*
733	** WEBPAGE: tagtimeline
734	**
735	** Render a timeline with all check-ins that contain non-propagating
736	** symbolic tags.
737	**
738	** Query parameters:
739

M src/th_main.c

+4 -4

		--- src/th_main.c
		+++ src/th_main.c
		@@ -2660,11 +2660,11 @@
2660	2660	** --open-config Open the configuration database
2661	2661	** --set-anon-caps Set anonymous login capabilities
2662	2662	** --set-user-caps Set user login capabilities
2663	2663	** --th-trace Trace TH1 execution (for debugging purposes)
2664	2664	*/
2665		-void test_th_render(void){
	2665	+void test_th_render_cmd(void){
2666	2666	int forceCgi, fullHttpReply;
2667	2667	Blob in;
2668	2668	Th_InitTraceLog();
2669	2669	forceCgi = find_option("cgi", 0, 0)!=0;
2670	2670	fullHttpReply = find_option("http", 0, 0)!=0;
		@@ -2709,11 +2709,11 @@
2709	2709	** --open-config Open the configuration database
2710	2710	** --set-anon-caps Set anonymous login capabilities
2711	2711	** --set-user-caps Set user login capabilities
2712	2712	** --th-trace Trace TH1 execution (for debugging purposes)
2713	2713	*/
2714		-void test_th_eval(void){
	2714	+void test_th_eval_cmd(void){
2715	2715	int rc;
2716	2716	const char *zRc;
2717	2717	int forceCgi, fullHttpReply;
2718	2718	Th_InitTraceLog();
2719	2719	forceCgi = find_option("cgi", 0, 0)!=0;
		@@ -2761,11 +2761,11 @@
2761	2761	** --open-config Open the configuration database
2762	2762	** --set-anon-caps Set anonymous login capabilities
2763	2763	** --set-user-caps Set user login capabilities
2764	2764	** --th-trace Trace TH1 execution (for debugging purposes)
2765	2765	*/
2766		-void test_th_source(void){
	2766	+void test_th_source_cmd(void){
2767	2767	int rc;
2768	2768	const char *zRc;
2769	2769	int forceCgi, fullHttpReply;
2770	2770	Blob in;
2771	2771	Th_InitTraceLog();
		@@ -2835,11 +2835,11 @@
2835	2835	**
2836	2836	** --cgi Include a CGI response header in the output
2837	2837	** --http Include an HTTP response header in the output
2838	2838	** --th-trace Trace TH1 execution (for debugging purposes)
2839	2839	*/
2840		-void test_th_hook(void){
	2840	+void test_th_hook_cmd(void){
2841	2841	int rc = TH_OK;
2842	2842	int nResult = 0;
2843	2843	char *zResult = 0;
2844	2844	int forceCgi, fullHttpReply;
2845	2845	Th_InitTraceLog();
2846	2846

	--- src/th_main.c
	+++ src/th_main.c
	@@ -2660,11 +2660,11 @@
2660	** --open-config Open the configuration database
2661	** --set-anon-caps Set anonymous login capabilities
2662	** --set-user-caps Set user login capabilities
2663	** --th-trace Trace TH1 execution (for debugging purposes)
2664	*/
2665	void test_th_render(void){
2666	int forceCgi, fullHttpReply;
2667	Blob in;
2668	Th_InitTraceLog();
2669	forceCgi = find_option("cgi", 0, 0)!=0;
2670	fullHttpReply = find_option("http", 0, 0)!=0;
	@@ -2709,11 +2709,11 @@
2709	** --open-config Open the configuration database
2710	** --set-anon-caps Set anonymous login capabilities
2711	** --set-user-caps Set user login capabilities
2712	** --th-trace Trace TH1 execution (for debugging purposes)
2713	*/
2714	void test_th_eval(void){
2715	int rc;
2716	const char *zRc;
2717	int forceCgi, fullHttpReply;
2718	Th_InitTraceLog();
2719	forceCgi = find_option("cgi", 0, 0)!=0;
	@@ -2761,11 +2761,11 @@
2761	** --open-config Open the configuration database
2762	** --set-anon-caps Set anonymous login capabilities
2763	** --set-user-caps Set user login capabilities
2764	** --th-trace Trace TH1 execution (for debugging purposes)
2765	*/
2766	void test_th_source(void){
2767	int rc;
2768	const char *zRc;
2769	int forceCgi, fullHttpReply;
2770	Blob in;
2771	Th_InitTraceLog();
	@@ -2835,11 +2835,11 @@
2835	**
2836	** --cgi Include a CGI response header in the output
2837	** --http Include an HTTP response header in the output
2838	** --th-trace Trace TH1 execution (for debugging purposes)
2839	*/
2840	void test_th_hook(void){
2841	int rc = TH_OK;
2842	int nResult = 0;
2843	char *zResult = 0;
2844	int forceCgi, fullHttpReply;
2845	Th_InitTraceLog();
2846

	--- src/th_main.c
	+++ src/th_main.c
	@@ -2660,11 +2660,11 @@
2660	** --open-config Open the configuration database
2661	** --set-anon-caps Set anonymous login capabilities
2662	** --set-user-caps Set user login capabilities
2663	** --th-trace Trace TH1 execution (for debugging purposes)
2664	*/
2665	void test_th_render_cmd(void){
2666	int forceCgi, fullHttpReply;
2667	Blob in;
2668	Th_InitTraceLog();
2669	forceCgi = find_option("cgi", 0, 0)!=0;
2670	fullHttpReply = find_option("http", 0, 0)!=0;
	@@ -2709,11 +2709,11 @@
2709	** --open-config Open the configuration database
2710	** --set-anon-caps Set anonymous login capabilities
2711	** --set-user-caps Set user login capabilities
2712	** --th-trace Trace TH1 execution (for debugging purposes)
2713	*/
2714	void test_th_eval_cmd(void){
2715	int rc;
2716	const char *zRc;
2717	int forceCgi, fullHttpReply;
2718	Th_InitTraceLog();
2719	forceCgi = find_option("cgi", 0, 0)!=0;
	@@ -2761,11 +2761,11 @@
2761	** --open-config Open the configuration database
2762	** --set-anon-caps Set anonymous login capabilities
2763	** --set-user-caps Set user login capabilities
2764	** --th-trace Trace TH1 execution (for debugging purposes)
2765	*/
2766	void test_th_source_cmd(void){
2767	int rc;
2768	const char *zRc;
2769	int forceCgi, fullHttpReply;
2770	Blob in;
2771	Th_InitTraceLog();
	@@ -2835,11 +2835,11 @@
2835	**
2836	** --cgi Include a CGI response header in the output
2837	** --http Include an HTTP response header in the output
2838	** --th-trace Trace TH1 execution (for debugging purposes)
2839	*/
2840	void test_th_hook_cmd(void){
2841	int rc = TH_OK;
2842	int nResult = 0;
2843	char *zResult = 0;
2844	int forceCgi, fullHttpReply;
2845	Th_InitTraceLog();
2846

M src/timeline.c

+5 -5

		--- src/timeline.c
		+++ src/timeline.c
		@@ -168,11 +168,11 @@
168	168	** Usage: %fossil test-hash-color TAG ...
169	169	**
170	170	** Print out the color names associated with each tag. Used for
171	171	** testing the hash_color() function.
172	172	*/
173		-void test_hash_color(void){
	173	+void test_hash_color_cmd(void){
174	174	int i;
175	175	for(i=2; i<g.argc; i++){
176	176	fossil_print("%20s: %s\n", g.argv[i], hash_color(g.argv[i]));
177	177	}
178	178	}
		@@ -181,11 +181,11 @@
181	181	** WEBPAGE: hash-color-test
182	182	**
183	183	** Print out the color names associated with each tag. Used for
184	184	** testing the hash_color() function.
185	185	*/
186		-void test_hash_color_page(void){
	186	+void hash_color_test_page(void){
187	187	const char *zBr;
188	188	char zNm[10];
189	189	int i, cnt;
190	190	login_check_credentials();
191	191
		@@ -1618,11 +1618,11 @@
1618	1618	** If both a= and b= appear then both upper and lower bounds are honored.
1619	1619	**
1620	1620	** CHECKIN or TIMEORTAG can be a check-in hash prefix, or a tag, or the
1621	1621	** name of a branch.
1622	1622	*/
1623		-void page_timeline(void){
	1623	+void timeline_page(void){
1624	1624	Stmt q; /* Query used to generate the timeline */
1625	1625	Blob sql; /* text of SQL used to generate timeline */
1626	1626	Blob desc; /* Description of the timeline */
1627	1627	int nEntry; /* Max number of entries on timeline */
1628	1628	int p_rid = name_to_typed_rid(P("p"),"ci"); /* artifact p and its parents */
		@@ -3022,11 +3022,11 @@
3022	3022	**
3023	3023	** Display all instances of child check-ins that appear earlier in time
3024	3024	** than their parent. If the -v\|--verbose option is provided, both the
3025	3025	** parent and child check-ins and their times are shown.
3026	3026	*/
3027		-void test_timewarp_cmd(void){
	3027	+void test_timewarp_list_cmd(void){
3028	3028	Stmt q;
3029	3029	int verboseFlag;
3030	3030
3031	3031	db_find_and_open_repository(0, 0);
3032	3032	verboseFlag = find_option("verbose", "v", 0)!=0;
		@@ -3060,11 +3060,11 @@
3060	3060	** Show all check-ins that are "timewarps". A timewarp is a
3061	3061	** check-in that occurs before its parent, according to the
3062	3062	** timestamp information on the check-in. This can only actually
3063	3063	** happen, of course, if a users system clock is set incorrectly.
3064	3064	*/
3065		-void test_timewarp_page(void){
	3065	+void timewarps_page(void){
3066	3066	Stmt q;
3067	3067	int cnt = 0;
3068	3068
3069	3069	login_check_credentials();
3070	3070	if( !g.perm.Read \|\| !g.perm.Hyperlink ){
3071	3071

	--- src/timeline.c
	+++ src/timeline.c
	@@ -168,11 +168,11 @@
168	** Usage: %fossil test-hash-color TAG ...
169	**
170	** Print out the color names associated with each tag. Used for
171	** testing the hash_color() function.
172	*/
173	void test_hash_color(void){
174	int i;
175	for(i=2; i<g.argc; i++){
176	fossil_print("%20s: %s\n", g.argv[i], hash_color(g.argv[i]));
177	}
178	}
	@@ -181,11 +181,11 @@
181	** WEBPAGE: hash-color-test
182	**
183	** Print out the color names associated with each tag. Used for
184	** testing the hash_color() function.
185	*/
186	void test_hash_color_page(void){
187	const char *zBr;
188	char zNm[10];
189	int i, cnt;
190	login_check_credentials();
191
	@@ -1618,11 +1618,11 @@
1618	** If both a= and b= appear then both upper and lower bounds are honored.
1619	**
1620	** CHECKIN or TIMEORTAG can be a check-in hash prefix, or a tag, or the
1621	** name of a branch.
1622	*/
1623	void page_timeline(void){
1624	Stmt q; /* Query used to generate the timeline */
1625	Blob sql; /* text of SQL used to generate timeline */
1626	Blob desc; /* Description of the timeline */
1627	int nEntry; /* Max number of entries on timeline */
1628	int p_rid = name_to_typed_rid(P("p"),"ci"); /* artifact p and its parents */
	@@ -3022,11 +3022,11 @@
3022	**
3023	** Display all instances of child check-ins that appear earlier in time
3024	** than their parent. If the -v\|--verbose option is provided, both the
3025	** parent and child check-ins and their times are shown.
3026	*/
3027	void test_timewarp_cmd(void){
3028	Stmt q;
3029	int verboseFlag;
3030
3031	db_find_and_open_repository(0, 0);
3032	verboseFlag = find_option("verbose", "v", 0)!=0;
	@@ -3060,11 +3060,11 @@
3060	** Show all check-ins that are "timewarps". A timewarp is a
3061	** check-in that occurs before its parent, according to the
3062	** timestamp information on the check-in. This can only actually
3063	** happen, of course, if a users system clock is set incorrectly.
3064	*/
3065	void test_timewarp_page(void){
3066	Stmt q;
3067	int cnt = 0;
3068
3069	login_check_credentials();
3070	if( !g.perm.Read \|\| !g.perm.Hyperlink ){
3071

	--- src/timeline.c
	+++ src/timeline.c
	@@ -168,11 +168,11 @@
168	** Usage: %fossil test-hash-color TAG ...
169	**
170	** Print out the color names associated with each tag. Used for
171	** testing the hash_color() function.
172	*/
173	void test_hash_color_cmd(void){
174	int i;
175	for(i=2; i<g.argc; i++){
176	fossil_print("%20s: %s\n", g.argv[i], hash_color(g.argv[i]));
177	}
178	}
	@@ -181,11 +181,11 @@
181	** WEBPAGE: hash-color-test
182	**
183	** Print out the color names associated with each tag. Used for
184	** testing the hash_color() function.
185	*/
186	void hash_color_test_page(void){
187	const char *zBr;
188	char zNm[10];
189	int i, cnt;
190	login_check_credentials();
191
	@@ -1618,11 +1618,11 @@
1618	** If both a= and b= appear then both upper and lower bounds are honored.
1619	**
1620	** CHECKIN or TIMEORTAG can be a check-in hash prefix, or a tag, or the
1621	** name of a branch.
1622	*/
1623	void timeline_page(void){
1624	Stmt q; /* Query used to generate the timeline */
1625	Blob sql; /* text of SQL used to generate timeline */
1626	Blob desc; /* Description of the timeline */
1627	int nEntry; /* Max number of entries on timeline */
1628	int p_rid = name_to_typed_rid(P("p"),"ci"); /* artifact p and its parents */
	@@ -3022,11 +3022,11 @@
3022	**
3023	** Display all instances of child check-ins that appear earlier in time
3024	** than their parent. If the -v\|--verbose option is provided, both the
3025	** parent and child check-ins and their times are shown.
3026	*/
3027	void test_timewarp_list_cmd(void){
3028	Stmt q;
3029	int verboseFlag;
3030
3031	db_find_and_open_repository(0, 0);
3032	verboseFlag = find_option("verbose", "v", 0)!=0;
	@@ -3060,11 +3060,11 @@
3060	** Show all check-ins that are "timewarps". A timewarp is a
3061	** check-in that occurs before its parent, according to the
3062	** timestamp information on the check-in. This can only actually
3063	** happen, of course, if a users system clock is set incorrectly.
3064	*/
3065	void timewarps_page(void){
3066	Stmt q;
3067	int cnt = 0;
3068
3069	login_check_credentials();
3070	if( !g.perm.Read \|\| !g.perm.Hyperlink ){
3071

M src/tkt.c

+5 -5

		--- src/tkt.c
		+++ src/tkt.c
		@@ -409,11 +409,11 @@
409	409	** Usage: %fossil test-ticket-rebuild TICKETID\|all
410	410	**
411	411	** Rebuild the TICKET and TICKETCHNG tables for the given ticket ID
412	412	** or for ALL.
413	413	*/
414		-void test_ticket_rebuild(void){
	414	+void test_ticket_rebuild_cmd(void){
415	415	db_find_and_open_repository(0, 0);
416	416	if( g.argc!=3 ) usage("TICKETID\|all");
417	417	if( fossil_strcmp(g.argv[2], "all")==0 ){
418	418	ticket_rebuild();
419	419	}else{
		@@ -1474,27 +1474,27 @@
1474	1474	**
1475	1475	** This is intended to be the primary "Ticket" page. Render as
1476	1476	** either ticket-search (if search is enabled) or as the
1477	1477	** /reportlist page (if ticket search is disabled).
1478	1478	*/
1479		-void tkt_home_page(void){
	1479	+void ticket_page(void){
1480	1480	login_check_credentials();
1481	1481	if( search_restrict(SRCH_TKT)!=0 ){
1482		- tkt_srchpage();
	1482	+ tktsrch_page();
1483	1483	}else{
1484		- view_list();
	1484	+ reportlist_page();
1485	1485	}
1486	1486	}
1487	1487
1488	1488	/*
1489	1489	** WEBPAGE: tktsrch
1490	1490	** Usage: /tktsrch?s=PATTERN
1491	1491	**
1492	1492	** Full-text search of all current tickets
1493	1493	*/
1494		-void tkt_srchpage(void){
	1494	+void tktsrch_page(void){
1495	1495	login_check_credentials();
1496	1496	style_header("Ticket Search");
1497	1497	ticket_standard_submenu(T_ALL_BUT(T_SRCH));
1498	1498	search_screen(SRCH_TKT, 0);
1499	1499	style_footer();
1500	1500	}
1501	1501

	--- src/tkt.c
	+++ src/tkt.c
	@@ -409,11 +409,11 @@
409	** Usage: %fossil test-ticket-rebuild TICKETID\|all
410	**
411	** Rebuild the TICKET and TICKETCHNG tables for the given ticket ID
412	** or for ALL.
413	*/
414	void test_ticket_rebuild(void){
415	db_find_and_open_repository(0, 0);
416	if( g.argc!=3 ) usage("TICKETID\|all");
417	if( fossil_strcmp(g.argv[2], "all")==0 ){
418	ticket_rebuild();
419	}else{
	@@ -1474,27 +1474,27 @@
1474	**
1475	** This is intended to be the primary "Ticket" page. Render as
1476	** either ticket-search (if search is enabled) or as the
1477	** /reportlist page (if ticket search is disabled).
1478	*/
1479	void tkt_home_page(void){
1480	login_check_credentials();
1481	if( search_restrict(SRCH_TKT)!=0 ){
1482	tkt_srchpage();
1483	}else{
1484	view_list();
1485	}
1486	}
1487
1488	/*
1489	** WEBPAGE: tktsrch
1490	** Usage: /tktsrch?s=PATTERN
1491	**
1492	** Full-text search of all current tickets
1493	*/
1494	void tkt_srchpage(void){
1495	login_check_credentials();
1496	style_header("Ticket Search");
1497	ticket_standard_submenu(T_ALL_BUT(T_SRCH));
1498	search_screen(SRCH_TKT, 0);
1499	style_footer();
1500	}
1501

	--- src/tkt.c
	+++ src/tkt.c
	@@ -409,11 +409,11 @@
409	** Usage: %fossil test-ticket-rebuild TICKETID\|all
410	**
411	** Rebuild the TICKET and TICKETCHNG tables for the given ticket ID
412	** or for ALL.
413	*/
414	void test_ticket_rebuild_cmd(void){
415	db_find_and_open_repository(0, 0);
416	if( g.argc!=3 ) usage("TICKETID\|all");
417	if( fossil_strcmp(g.argv[2], "all")==0 ){
418	ticket_rebuild();
419	}else{
	@@ -1474,27 +1474,27 @@
1474	**
1475	** This is intended to be the primary "Ticket" page. Render as
1476	** either ticket-search (if search is enabled) or as the
1477	** /reportlist page (if ticket search is disabled).
1478	*/
1479	void ticket_page(void){
1480	login_check_credentials();
1481	if( search_restrict(SRCH_TKT)!=0 ){
1482	tktsrch_page();
1483	}else{
1484	reportlist_page();
1485	}
1486	}
1487
1488	/*
1489	** WEBPAGE: tktsrch
1490	** Usage: /tktsrch?s=PATTERN
1491	**
1492	** Full-text search of all current tickets
1493	*/
1494	void tktsrch_page(void){
1495	login_check_credentials();
1496	style_header("Ticket Search");
1497	ticket_standard_submenu(T_ALL_BUT(T_SRCH));
1498	search_screen(SRCH_TKT, 0);
1499	style_footer();
1500	}
1501

M src/tktsetup.c

+1 -1

		--- src/tktsetup.c
		+++ src/tktsetup.c
		@@ -774,11 +774,11 @@
774	774	/*
775	775	** WEBPAGE: tktsetup_reportlist
776	776	** Administrative page used to view or edit the TH1 script that
777	777	** defines the "report list" page.
778	778	*/
779		-void tktsetup_reportlist(void){
	779	+void tktsetup_reportlist_page(void){
780	780	static const char zDesc[] =
781	781	@ Enter HTML with embedded TH1 script that will render the "report list" page
782	782	;
783	783	tktsetup_generic(
784	784	"HTML For Report List",
785	785

	--- src/tktsetup.c
	+++ src/tktsetup.c
	@@ -774,11 +774,11 @@
774	/*
775	** WEBPAGE: tktsetup_reportlist
776	** Administrative page used to view or edit the TH1 script that
777	** defines the "report list" page.
778	*/
779	void tktsetup_reportlist(void){
780	static const char zDesc[] =
781	@ Enter HTML with embedded TH1 script that will render the "report list" page
782	;
783	tktsetup_generic(
784	"HTML For Report List",
785

	--- src/tktsetup.c
	+++ src/tktsetup.c
	@@ -774,11 +774,11 @@
774	/*
775	** WEBPAGE: tktsetup_reportlist
776	** Administrative page used to view or edit the TH1 script that
777	** defines the "report list" page.
778	*/
779	void tktsetup_reportlist_page(void){
780	static const char zDesc[] =
781	@ Enter HTML with embedded TH1 script that will render the "report list" page
782	;
783	tktsetup_generic(
784	"HTML For Report List",
785

M src/url.c

+1 -1

		--- src/url.c
		+++ src/url.c
		@@ -322,11 +322,11 @@
322	322	** Usage: %fossil test-urlparser URL ?options?
323	323	**
324	324	** --remember Store results in last-sync-url
325	325	** --prompt-pw Prompt for password if missing
326	326	*/
327		-void cmd_test_urlparser(void){
	327	+void test_urlparser_cmd(void){
328	328	int i;
329	329	unsigned fg = 0;
330	330	url_proxy_options();
331	331	if( find_option("remember",0,0) ){
332	332	db_must_be_within_tree();
333	333

	--- src/url.c
	+++ src/url.c
	@@ -322,11 +322,11 @@
322	** Usage: %fossil test-urlparser URL ?options?
323	**
324	** --remember Store results in last-sync-url
325	** --prompt-pw Prompt for password if missing
326	*/
327	void cmd_test_urlparser(void){
328	int i;
329	unsigned fg = 0;
330	url_proxy_options();
331	if( find_option("remember",0,0) ){
332	db_must_be_within_tree();
333

	--- src/url.c
	+++ src/url.c
	@@ -322,11 +322,11 @@
322	** Usage: %fossil test-urlparser URL ?options?
323	**
324	** --remember Store results in last-sync-url
325	** --prompt-pw Prompt for password if missing
326	*/
327	void test_urlparser_cmd(void){
328	int i;
329	unsigned fg = 0;
330	url_proxy_options();
331	if( find_option("remember",0,0) ){
332	db_must_be_within_tree();
333

M src/user.c

+1 -1

		--- src/user.c
		+++ src/user.c
		@@ -568,11 +568,11 @@
568	568	**
569	569	** Convert all local password storage to use a SHA1 hash of the password
570	570	** rather than cleartext. Passwords that are already stored as the SHA1
571	571	** has are unchanged.
572	572	*/
573		-void user_hash_passwords_cmd(void){
	573	+void test_hash_passwords_cmd(void){
574	574	if( g.argc!=3 ) usage("REPOSITORY");
575	575	db_open_repository(g.argv[2]);
576	576	sqlite3_create_function(g.db, "shared_secret", 2, SQLITE_UTF8, 0,
577	577	sha1_shared_secret_sql_function, 0, 0);
578	578	db_multi_exec(
579	579

	--- src/user.c
	+++ src/user.c
	@@ -568,11 +568,11 @@
568	**
569	** Convert all local password storage to use a SHA1 hash of the password
570	** rather than cleartext. Passwords that are already stored as the SHA1
571	** has are unchanged.
572	*/
573	void user_hash_passwords_cmd(void){
574	if( g.argc!=3 ) usage("REPOSITORY");
575	db_open_repository(g.argv[2]);
576	sqlite3_create_function(g.db, "shared_secret", 2, SQLITE_UTF8, 0,
577	sha1_shared_secret_sql_function, 0, 0);
578	db_multi_exec(
579

	--- src/user.c
	+++ src/user.c
	@@ -568,11 +568,11 @@
568	**
569	** Convert all local password storage to use a SHA1 hash of the password
570	** rather than cleartext. Passwords that are already stored as the SHA1
571	** has are unchanged.
572	*/
573	void test_hash_passwords_cmd(void){
574	if( g.argc!=3 ) usage("REPOSITORY");
575	db_open_repository(g.argv[2]);
576	sqlite3_create_function(g.db, "shared_secret", 2, SQLITE_UTF8, 0,
577	sha1_shared_secret_sql_function, 0, 0);
578	db_multi_exec(
579

M src/util.c

+1 -1

		--- src/util.c
		+++ src/util.c
		@@ -566,11 +566,11 @@
566	566	**
567	567	** Generate a random password string of approximately N characters in length.
568	568	** If N is omitted, use 10. Values of N less than 8 are changed to 8
569	569	** and greater than 55 and changed to 55.
570	570	*/
571		-void test_random_password(void){
	571	+void test_random_password_cmd(void){
572	572	int N = 10;
573	573	if( g.argc>=3 ){
574	574	N = atoi(g.argv[2]);
575	575	}
576	576	fossil_print("%s\n", fossil_random_password(N));
577	577

	--- src/util.c
	+++ src/util.c
	@@ -566,11 +566,11 @@
566	**
567	** Generate a random password string of approximately N characters in length.
568	** If N is omitted, use 10. Values of N less than 8 are changed to 8
569	** and greater than 55 and changed to 55.
570	*/
571	void test_random_password(void){
572	int N = 10;
573	if( g.argc>=3 ){
574	N = atoi(g.argv[2]);
575	}
576	fossil_print("%s\n", fossil_random_password(N));
577

	--- src/util.c
	+++ src/util.c
	@@ -566,11 +566,11 @@
566	**
567	** Generate a random password string of approximately N characters in length.
568	** If N is omitted, use 10. Values of N less than 8 are changed to 8
569	** and greater than 55 and changed to 55.
570	*/
571	void test_random_password_cmd(void){
572	int N = 10;
573	if( g.argc>=3 ){
574	N = atoi(g.argv[2]);
575	}
576	fossil_print("%s\n", fossil_random_password(N));
577

M src/verify.c

+1 -1

		--- src/verify.c
		+++ src/verify.c
		@@ -111,11 +111,11 @@
111	111	/*
112	112	** COMMAND: test-verify-all
113	113	**
114	114	** Verify all records in the repository.
115	115	*/
116		-void verify_all_cmd(void){
	116	+void test_verify_all_cmd(void){
117	117	Stmt q;
118	118	int cnt = 0;
119	119	db_must_be_within_tree();
120	120	db_prepare(&q, "SELECT rid FROM blob");
121	121	while( db_step(&q)==SQLITE_ROW ){
122	122

	--- src/verify.c
	+++ src/verify.c
	@@ -111,11 +111,11 @@
111	/*
112	** COMMAND: test-verify-all
113	**
114	** Verify all records in the repository.
115	*/
116	void verify_all_cmd(void){
117	Stmt q;
118	int cnt = 0;
119	db_must_be_within_tree();
120	db_prepare(&q, "SELECT rid FROM blob");
121	while( db_step(&q)==SQLITE_ROW ){
122

	--- src/verify.c
	+++ src/verify.c
	@@ -111,11 +111,11 @@
111	/*
112	** COMMAND: test-verify-all
113	**
114	** Verify all records in the repository.
115	*/
116	void test_verify_all_cmd(void){
117	Stmt q;
118	int cnt = 0;
119	db_must_be_within_tree();
120	db_prepare(&q, "SELECT rid FROM blob");
121	while( db_step(&q)==SQLITE_ROW ){
122

M src/webmail.c

+6 -6

		--- src/webmail.c
		+++ src/webmail.c
		@@ -306,11 +306,11 @@
306	306	** Usage: %fossil test-decode-email FILE
307	307	**
308	308	** Read an rfc-2822 formatted email out of FILE, then write a decoding
309	309	** to stdout. Use for testing and validating the email decoder.
310	310	*/
311		-void test_email_decode_cmd(void){
	311	+void test_decode_email_cmd(void){
312	312	Blob email;
313	313	EmailToc *p;
314	314	int i;
315	315	verify_all_options();
316	316	if( g.argc!=3 ) usage("FILE");
		@@ -574,11 +574,11 @@
574	574	};
575	575	style_submenu_multichoice("d", sizeof(az)/(2*sizeof(az[0])), az, 0);
576	576	}
577	577
578	578	/*
579		-** WEBPAGE: webmail
	579	+** WEBPAGE: webmail
580	580	**
581	581	** This page can be used to read content from the EMAILBOX table
582	582	** that contains email received by the "fossil smtpd" command.
583	583	**
584	584	** Query parameters:
		@@ -762,20 +762,20 @@
762	762	style_footer();
763	763	db_end_transaction(0);
764	764	}
765	765
766	766	/*
767		-** WEBPAGE: emailblob
	767	+** WEBPAGE: emailblob
768	768	**
769	769	** This page, accessible only to administrators, allows easy viewing of
770	770	** the emailblob table - the table that contains the text of email messages
771	771	** both inbound and outbound, and transcripts of SMTP sessions.
772	772	**
773	773	** id=N Show the text of emailblob with emailid==N
774	774	**
775	775	*/
776		-void webmail_emailblob_page(void){
	776	+void emailblob_page(void){
777	777	int id = atoi(PD("id","0"));
778	778	Stmt q;
779	779	login_check_credentials();
780	780	if( !g.perm.Setup ){
781	781	login_needed(0);
		@@ -858,17 +858,17 @@
858	858	}
859	859	style_footer();
860	860	}
861	861
862	862	/*
863		-** WEBPAGE: emailoutq
	863	+** WEBPAGE: emailoutq
864	864	**
865	865	** This page, accessible only to administrators, allows easy viewing of
866	866	** the emailoutq table - the table that contains the email messages
867	867	** that are queued for transmission via SMTP.
868	868	*/
869		-void webmail_emailoutq_page(void){
	869	+void emailoutq_page(void){
870	870	Stmt q;
871	871	login_check_credentials();
872	872	if( !g.perm.Setup ){
873	873	login_needed(0);
874	874	return;
875	875

	--- src/webmail.c
	+++ src/webmail.c
	@@ -306,11 +306,11 @@
306	** Usage: %fossil test-decode-email FILE
307	**
308	** Read an rfc-2822 formatted email out of FILE, then write a decoding
309	** to stdout. Use for testing and validating the email decoder.
310	*/
311	void test_email_decode_cmd(void){
312	Blob email;
313	EmailToc *p;
314	int i;
315	verify_all_options();
316	if( g.argc!=3 ) usage("FILE");
	@@ -574,11 +574,11 @@
574	};
575	style_submenu_multichoice("d", sizeof(az)/(2*sizeof(az[0])), az, 0);
576	}
577
578	/*
579	** WEBPAGE: webmail
580	**
581	** This page can be used to read content from the EMAILBOX table
582	** that contains email received by the "fossil smtpd" command.
583	**
584	** Query parameters:
	@@ -762,20 +762,20 @@
762	style_footer();
763	db_end_transaction(0);
764	}
765
766	/*
767	** WEBPAGE: emailblob
768	**
769	** This page, accessible only to administrators, allows easy viewing of
770	** the emailblob table - the table that contains the text of email messages
771	** both inbound and outbound, and transcripts of SMTP sessions.
772	**
773	** id=N Show the text of emailblob with emailid==N
774	**
775	*/
776	void webmail_emailblob_page(void){
777	int id = atoi(PD("id","0"));
778	Stmt q;
779	login_check_credentials();
780	if( !g.perm.Setup ){
781	login_needed(0);
	@@ -858,17 +858,17 @@
858	}
859	style_footer();
860	}
861
862	/*
863	** WEBPAGE: emailoutq
864	**
865	** This page, accessible only to administrators, allows easy viewing of
866	** the emailoutq table - the table that contains the email messages
867	** that are queued for transmission via SMTP.
868	*/
869	void webmail_emailoutq_page(void){
870	Stmt q;
871	login_check_credentials();
872	if( !g.perm.Setup ){
873	login_needed(0);
874	return;
875

	--- src/webmail.c
	+++ src/webmail.c
	@@ -306,11 +306,11 @@
306	** Usage: %fossil test-decode-email FILE
307	**
308	** Read an rfc-2822 formatted email out of FILE, then write a decoding
309	** to stdout. Use for testing and validating the email decoder.
310	*/
311	void test_decode_email_cmd(void){
312	Blob email;
313	EmailToc *p;
314	int i;
315	verify_all_options();
316	if( g.argc!=3 ) usage("FILE");
	@@ -574,11 +574,11 @@
574	};
575	style_submenu_multichoice("d", sizeof(az)/(2*sizeof(az[0])), az, 0);
576	}
577
578	/*
579	** WEBPAGE: webmail
580	**
581	** This page can be used to read content from the EMAILBOX table
582	** that contains email received by the "fossil smtpd" command.
583	**
584	** Query parameters:
	@@ -762,20 +762,20 @@
762	style_footer();
763	db_end_transaction(0);
764	}
765
766	/*
767	** WEBPAGE: emailblob
768	**
769	** This page, accessible only to administrators, allows easy viewing of
770	** the emailblob table - the table that contains the text of email messages
771	** both inbound and outbound, and transcripts of SMTP sessions.
772	**
773	** id=N Show the text of emailblob with emailid==N
774	**
775	*/
776	void emailblob_page(void){
777	int id = atoi(PD("id","0"));
778	Stmt q;
779	login_check_credentials();
780	if( !g.perm.Setup ){
781	login_needed(0);
	@@ -858,17 +858,17 @@
858	}
859	style_footer();
860	}
861
862	/*
863	** WEBPAGE: emailoutq
864	**
865	** This page, accessible only to administrators, allows easy viewing of
866	** the emailoutq table - the table that contains the email messages
867	** that are queued for transmission via SMTP.
868	*/
869	void emailoutq_page(void){
870	Stmt q;
871	login_check_credentials();
872	if( !g.perm.Setup ){
873	login_needed(0);
874	return;
875

M src/wiki.c

+5 -5

		--- src/wiki.c
		+++ src/wiki.c
		@@ -209,11 +209,11 @@
209	209	/*
210	210	** WEBPAGE: md_rules
211	211	**
212	212	** Show a summary of the Markdown wiki formatting rules.
213	213	*/
214		-void markdown_rules_page(void){
	214	+void md_rules_page(void){
215	215	Blob x;
216	216	int fTxt = P("txt")!=0;
217	217	style_header("Markdown Formatting Rules");
218	218	if( fTxt ){
219	219	style_submenu_element("Formatted", "%R/md_rules");
		@@ -318,11 +318,11 @@
318	318
319	319	/*
320	320	** WEBPAGE: wikihelp
321	321	** A generic landing page for wiki.
322	322	*/
323		-void wiki_helppage(void){
	323	+void wikihelp_page(void){
324	324	login_check_credentials();
325	325	if( !g.perm.RdWiki ){ login_needed(g.anon.RdWiki); return; }
326	326	style_header("Wiki Help");
327	327	wiki_standard_submenu(W_ALL_BUT(W_HELP));
328	328	@ <h2>Wiki Links</h2>
		@@ -356,11 +356,11 @@
356	356	** WEBPAGE: wikisrch
357	357	** Usage: /wikisrch?s=PATTERN
358	358	**
359	359	** Full-text search of all current wiki text
360	360	*/
361		-void wiki_srchpage(void){
	361	+void wikisrch_page(void){
362	362	login_check_credentials();
363	363	style_header("Wiki Search");
364	364	wiki_standard_submenu(W_HELP\|W_LIST\|W_SANDBOX);
365	365	search_screen(SRCH_WIKI, 0);
366	366	style_footer();
		@@ -478,13 +478,13 @@
478	478	login_check_credentials();
479	479	if( !g.perm.RdWiki ){ login_needed(g.anon.RdWiki); return; }
480	480	zPageName = P("name");
481	481	if( zPageName==0 ){
482	482	if( search_restrict(SRCH_WIKI)!=0 ){
483		- wiki_srchpage();
	483	+ wikisrch_page();
484	484	}else{
485		- wiki_helppage();
	485	+ wikihelp_page();
486	486	}
487	487	return;
488	488	}
489	489	if( check_name(zPageName) ) return;
490	490	isSandbox = is_sandbox(zPageName);
491	491

	--- src/wiki.c
	+++ src/wiki.c
	@@ -209,11 +209,11 @@
209	/*
210	** WEBPAGE: md_rules
211	**
212	** Show a summary of the Markdown wiki formatting rules.
213	*/
214	void markdown_rules_page(void){
215	Blob x;
216	int fTxt = P("txt")!=0;
217	style_header("Markdown Formatting Rules");
218	if( fTxt ){
219	style_submenu_element("Formatted", "%R/md_rules");
	@@ -318,11 +318,11 @@
318
319	/*
320	** WEBPAGE: wikihelp
321	** A generic landing page for wiki.
322	*/
323	void wiki_helppage(void){
324	login_check_credentials();
325	if( !g.perm.RdWiki ){ login_needed(g.anon.RdWiki); return; }
326	style_header("Wiki Help");
327	wiki_standard_submenu(W_ALL_BUT(W_HELP));
328	@ <h2>Wiki Links</h2>
	@@ -356,11 +356,11 @@
356	** WEBPAGE: wikisrch
357	** Usage: /wikisrch?s=PATTERN
358	**
359	** Full-text search of all current wiki text
360	*/
361	void wiki_srchpage(void){
362	login_check_credentials();
363	style_header("Wiki Search");
364	wiki_standard_submenu(W_HELP\|W_LIST\|W_SANDBOX);
365	search_screen(SRCH_WIKI, 0);
366	style_footer();
	@@ -478,13 +478,13 @@
478	login_check_credentials();
479	if( !g.perm.RdWiki ){ login_needed(g.anon.RdWiki); return; }
480	zPageName = P("name");
481	if( zPageName==0 ){
482	if( search_restrict(SRCH_WIKI)!=0 ){
483	wiki_srchpage();
484	}else{
485	wiki_helppage();
486	}
487	return;
488	}
489	if( check_name(zPageName) ) return;
490	isSandbox = is_sandbox(zPageName);
491

	--- src/wiki.c
	+++ src/wiki.c
	@@ -209,11 +209,11 @@
209	/*
210	** WEBPAGE: md_rules
211	**
212	** Show a summary of the Markdown wiki formatting rules.
213	*/
214	void md_rules_page(void){
215	Blob x;
216	int fTxt = P("txt")!=0;
217	style_header("Markdown Formatting Rules");
218	if( fTxt ){
219	style_submenu_element("Formatted", "%R/md_rules");
	@@ -318,11 +318,11 @@
318
319	/*
320	** WEBPAGE: wikihelp
321	** A generic landing page for wiki.
322	*/
323	void wikihelp_page(void){
324	login_check_credentials();
325	if( !g.perm.RdWiki ){ login_needed(g.anon.RdWiki); return; }
326	style_header("Wiki Help");
327	wiki_standard_submenu(W_ALL_BUT(W_HELP));
328	@ <h2>Wiki Links</h2>
	@@ -356,11 +356,11 @@
356	** WEBPAGE: wikisrch
357	** Usage: /wikisrch?s=PATTERN
358	**
359	** Full-text search of all current wiki text
360	*/
361	void wikisrch_page(void){
362	login_check_credentials();
363	style_header("Wiki Search");
364	wiki_standard_submenu(W_HELP\|W_LIST\|W_SANDBOX);
365	search_screen(SRCH_WIKI, 0);
366	style_footer();
	@@ -478,13 +478,13 @@
478	login_check_credentials();
479	if( !g.perm.RdWiki ){ login_needed(g.anon.RdWiki); return; }
480	zPageName = P("name");
481	if( zPageName==0 ){
482	if( search_restrict(SRCH_WIKI)!=0 ){
483	wikisrch_page();
484	}else{
485	wikihelp_page();
486	}
487	return;
488	}
489	if( check_name(zPageName) ) return;
490	isSandbox = is_sandbox(zPageName);
491

M src/wikiformat.c

+5 -5

		--- src/wikiformat.c
		+++ src/wikiformat.c
		@@ -1784,11 +1784,11 @@
1784	1784	** --linksonly Set the WIKI_LINKSONLY flag
1785	1785	** --nobadlinks Set the WIKI_NOBADLINKS flag
1786	1786	** --inline Set the WIKI_INLINE flag
1787	1787	** --noblock Set the WIKI_NOBLOCK flag
1788	1788	*/
1789		-void test_wiki_render(void){
	1789	+void test_wiki_render_cmd(void){
1790	1790	Blob in, out;
1791	1791	int flags = 0;
1792	1792	if( find_option("buttons",0,0)!=0 ) flags \|= WIKI_BUTTONS;
1793	1793	if( find_option("htmlonly",0,0)!=0 ) flags \|= WIKI_HTMLONLY;
1794	1794	if( find_option("linksonly",0,0)!=0 ) flags \|= WIKI_LINKSONLY;
		@@ -1809,11 +1809,11 @@
1809	1809	**
1810	1810	** Usage: %fossil test-markdown-render FILE
1811	1811	**
1812	1812	** Render markdown in FILE as HTML on stdout.
1813	1813	*/
1814		-void test_markdown_render(void){
	1814	+void test_markdown_render_cmd(void){
1815	1815	Blob in, out;
1816	1816	db_find_and_open_repository(OPEN_OK_NOT_FOUND\|OPEN_SUBSTITUTE,0);
1817	1817	verify_all_options();
1818	1818	if( g.argc!=3 ) usage("FILE");
1819	1819	blob_zero(&out);
		@@ -2139,11 +2139,11 @@
2139	2139	** COMMAND: test-html-tokenize
2140	2140	**
2141	2141	** Tokenize an HTML file. Return the offset and length and text of
2142	2142	** each token - one token per line. Omit white-space tokens.
2143	2143	*/
2144		-void test_html_tokenize(void){
	2144	+void test_html_tokenize_cmd(void){
2145	2145	Blob in;
2146	2146	char *z;
2147	2147	int i;
2148	2148	int iOfst, n;
2149	2149
		@@ -2274,11 +2274,11 @@
2274	2274	** COMMAND: test-html-tidy
2275	2275	**
2276	2276	** Run the htmlTidy() routine on the content of all files named on
2277	2277	** the command-line and write the results to standard output.
2278	2278	*/
2279		-void test_html_tidy(void){
	2279	+void test_html_tidy_cmd(void){
2280	2280	Blob in, out;
2281	2281	int i;
2282	2282
2283	2283	for(i=2; i<g.argc; i++){
2284	2284	blob_read_from_file(&in, g.argv[i], ExtFILE);
		@@ -2401,11 +2401,11 @@
2401	2401	** output.
2402	2402	**
2403	2403	** This command is intended as a test and debug interface for
2404	2404	** the html_to_plaintext() routine.
2405	2405	*/
2406		-void test_html_to_text(void){
	2406	+void test_html_to_text_cmd(void){
2407	2407	Blob in, out;
2408	2408	int i;
2409	2409
2410	2410	for(i=2; i<g.argc; i++){
2411	2411	blob_read_from_file(&in, g.argv[i], ExtFILE);
2412	2412

	--- src/wikiformat.c
	+++ src/wikiformat.c
	@@ -1784,11 +1784,11 @@
1784	** --linksonly Set the WIKI_LINKSONLY flag
1785	** --nobadlinks Set the WIKI_NOBADLINKS flag
1786	** --inline Set the WIKI_INLINE flag
1787	** --noblock Set the WIKI_NOBLOCK flag
1788	*/
1789	void test_wiki_render(void){
1790	Blob in, out;
1791	int flags = 0;
1792	if( find_option("buttons",0,0)!=0 ) flags \|= WIKI_BUTTONS;
1793	if( find_option("htmlonly",0,0)!=0 ) flags \|= WIKI_HTMLONLY;
1794	if( find_option("linksonly",0,0)!=0 ) flags \|= WIKI_LINKSONLY;
	@@ -1809,11 +1809,11 @@
1809	**
1810	** Usage: %fossil test-markdown-render FILE
1811	**
1812	** Render markdown in FILE as HTML on stdout.
1813	*/
1814	void test_markdown_render(void){
1815	Blob in, out;
1816	db_find_and_open_repository(OPEN_OK_NOT_FOUND\|OPEN_SUBSTITUTE,0);
1817	verify_all_options();
1818	if( g.argc!=3 ) usage("FILE");
1819	blob_zero(&out);
	@@ -2139,11 +2139,11 @@
2139	** COMMAND: test-html-tokenize
2140	**
2141	** Tokenize an HTML file. Return the offset and length and text of
2142	** each token - one token per line. Omit white-space tokens.
2143	*/
2144	void test_html_tokenize(void){
2145	Blob in;
2146	char *z;
2147	int i;
2148	int iOfst, n;
2149
	@@ -2274,11 +2274,11 @@
2274	** COMMAND: test-html-tidy
2275	**
2276	** Run the htmlTidy() routine on the content of all files named on
2277	** the command-line and write the results to standard output.
2278	*/
2279	void test_html_tidy(void){
2280	Blob in, out;
2281	int i;
2282
2283	for(i=2; i<g.argc; i++){
2284	blob_read_from_file(&in, g.argv[i], ExtFILE);
	@@ -2401,11 +2401,11 @@
2401	** output.
2402	**
2403	** This command is intended as a test and debug interface for
2404	** the html_to_plaintext() routine.
2405	*/
2406	void test_html_to_text(void){
2407	Blob in, out;
2408	int i;
2409
2410	for(i=2; i<g.argc; i++){
2411	blob_read_from_file(&in, g.argv[i], ExtFILE);
2412

	--- src/wikiformat.c
	+++ src/wikiformat.c
	@@ -1784,11 +1784,11 @@
1784	** --linksonly Set the WIKI_LINKSONLY flag
1785	** --nobadlinks Set the WIKI_NOBADLINKS flag
1786	** --inline Set the WIKI_INLINE flag
1787	** --noblock Set the WIKI_NOBLOCK flag
1788	*/
1789	void test_wiki_render_cmd(void){
1790	Blob in, out;
1791	int flags = 0;
1792	if( find_option("buttons",0,0)!=0 ) flags \|= WIKI_BUTTONS;
1793	if( find_option("htmlonly",0,0)!=0 ) flags \|= WIKI_HTMLONLY;
1794	if( find_option("linksonly",0,0)!=0 ) flags \|= WIKI_LINKSONLY;
	@@ -1809,11 +1809,11 @@
1809	**
1810	** Usage: %fossil test-markdown-render FILE
1811	**
1812	** Render markdown in FILE as HTML on stdout.
1813	*/
1814	void test_markdown_render_cmd(void){
1815	Blob in, out;
1816	db_find_and_open_repository(OPEN_OK_NOT_FOUND\|OPEN_SUBSTITUTE,0);
1817	verify_all_options();
1818	if( g.argc!=3 ) usage("FILE");
1819	blob_zero(&out);
	@@ -2139,11 +2139,11 @@
2139	** COMMAND: test-html-tokenize
2140	**
2141	** Tokenize an HTML file. Return the offset and length and text of
2142	** each token - one token per line. Omit white-space tokens.
2143	*/
2144	void test_html_tokenize_cmd(void){
2145	Blob in;
2146	char *z;
2147	int i;
2148	int iOfst, n;
2149
	@@ -2274,11 +2274,11 @@
2274	** COMMAND: test-html-tidy
2275	**
2276	** Run the htmlTidy() routine on the content of all files named on
2277	** the command-line and write the results to standard output.
2278	*/
2279	void test_html_tidy_cmd(void){
2280	Blob in, out;
2281	int i;
2282
2283	for(i=2; i<g.argc; i++){
2284	blob_read_from_file(&in, g.argv[i], ExtFILE);
	@@ -2401,11 +2401,11 @@
2401	** output.
2402	**
2403	** This command is intended as a test and debug interface for
2404	** the html_to_plaintext() routine.
2405	*/
2406	void test_html_to_text_cmd(void){
2407	Blob in, out;
2408	int i;
2409
2410	for(i=2; i<g.argc; i++){
2411	blob_read_from_file(&in, g.argv[i], ExtFILE);
2412

M src/winhttp.c

+1 -1

		--- src/winhttp.c
		+++ src/winhttp.c
		@@ -1018,11 +1018,11 @@
1018	1018	**
1019	1019	** NOTE: This command is available on Windows operating systems only and
1020	1020	** requires administrative rights on the machine executed.
1021	1021	**
1022	1022	*/
1023		-void cmd_win32_service(void){
	1023	+void win32_service_cmd(void){
1024	1024	int n;
1025	1025	const char *zMethod;
1026	1026	const char zSvcName = "Fossil-DSCM"; / Default service name */
1027	1027
1028	1028	if( g.argc<3 ){
1029	1029

	--- src/winhttp.c
	+++ src/winhttp.c
	@@ -1018,11 +1018,11 @@
1018	**
1019	** NOTE: This command is available on Windows operating systems only and
1020	** requires administrative rights on the machine executed.
1021	**
1022	*/
1023	void cmd_win32_service(void){
1024	int n;
1025	const char *zMethod;
1026	const char zSvcName = "Fossil-DSCM"; / Default service name */
1027
1028	if( g.argc<3 ){
1029

	--- src/winhttp.c
	+++ src/winhttp.c
	@@ -1018,11 +1018,11 @@
1018	**
1019	** NOTE: This command is available on Windows operating systems only and
1020	** requires administrative rights on the machine executed.
1021	**
1022	*/
1023	void win32_service_cmd(void){
1024	int n;
1025	const char *zMethod;
1026	const char zSvcName = "Fossil-DSCM"; / Default service name */
1027
1028	if( g.argc<3 ){
1029

M src/xfer.c

+3 -3

		--- src/xfer.c
		+++ src/xfer.c
		@@ -1126,11 +1126,11 @@
1126	1126	**
1127	1127	** This is the transfer handler on the server side. The transfer
1128	1128	** message has been uncompressed and placed in the g.cgiIn blob.
1129	1129	** Process this message and form an appropriate reply.
1130	1130	*/
1131		-void page_xfer(void){
	1131	+void xfer_page(void){
1132	1132	int isPull = 0;
1133	1133	int isPush = 0;
1134	1134	int nErr = 0;
1135	1135	Xfer xfer;
1136	1136	int deltaFlag = 0;
		@@ -1691,19 +1691,19 @@
1691	1691	** server in gdb:
1692	1692	**
1693	1693	** gdb fossil
1694	1694	** r test-xfer out.txt
1695	1695	*/
1696		-void cmd_test_xfer(void){
	1696	+void test_xfer_cmd(void){
1697	1697	db_find_and_open_repository(0,0);
1698	1698	if( g.argc!=2 && g.argc!=3 ){
1699	1699	usage("?MESSAGEFILE?");
1700	1700	}
1701	1701	blob_zero(&g.cgiIn);
1702	1702	blob_read_from_file(&g.cgiIn, g.argc==2 ? "-" : g.argv[2], ExtFILE);
1703	1703	disableLogin = 1;
1704		- page_xfer();
	1704	+ xfer_page();
1705	1705	fossil_print("%s\n", cgi_extract_content());
1706	1706	}
1707	1707
1708	1708	/*
1709	1709	** Format strings for progress reporting.
1710	1710

	--- src/xfer.c
	+++ src/xfer.c
	@@ -1126,11 +1126,11 @@
1126	**
1127	** This is the transfer handler on the server side. The transfer
1128	** message has been uncompressed and placed in the g.cgiIn blob.
1129	** Process this message and form an appropriate reply.
1130	*/
1131	void page_xfer(void){
1132	int isPull = 0;
1133	int isPush = 0;
1134	int nErr = 0;
1135	Xfer xfer;
1136	int deltaFlag = 0;
	@@ -1691,19 +1691,19 @@
1691	** server in gdb:
1692	**
1693	** gdb fossil
1694	** r test-xfer out.txt
1695	*/
1696	void cmd_test_xfer(void){
1697	db_find_and_open_repository(0,0);
1698	if( g.argc!=2 && g.argc!=3 ){
1699	usage("?MESSAGEFILE?");
1700	}
1701	blob_zero(&g.cgiIn);
1702	blob_read_from_file(&g.cgiIn, g.argc==2 ? "-" : g.argv[2], ExtFILE);
1703	disableLogin = 1;
1704	page_xfer();
1705	fossil_print("%s\n", cgi_extract_content());
1706	}
1707
1708	/*
1709	** Format strings for progress reporting.
1710

	--- src/xfer.c
	+++ src/xfer.c
	@@ -1126,11 +1126,11 @@
1126	**
1127	** This is the transfer handler on the server side. The transfer
1128	** message has been uncompressed and placed in the g.cgiIn blob.
1129	** Process this message and form an appropriate reply.
1130	*/
1131	void xfer_page(void){
1132	int isPull = 0;
1133	int isPush = 0;
1134	int nErr = 0;
1135	Xfer xfer;
1136	int deltaFlag = 0;
	@@ -1691,19 +1691,19 @@
1691	** server in gdb:
1692	**
1693	** gdb fossil
1694	** r test-xfer out.txt
1695	*/
1696	void test_xfer_cmd(void){
1697	db_find_and_open_repository(0,0);
1698	if( g.argc!=2 && g.argc!=3 ){
1699	usage("?MESSAGEFILE?");
1700	}
1701	blob_zero(&g.cgiIn);
1702	blob_read_from_file(&g.cgiIn, g.argc==2 ? "-" : g.argv[2], ExtFILE);
1703	disableLogin = 1;
1704	xfer_page();
1705	fossil_print("%s\n", cgi_extract_content());
1706	}
1707
1708	/*
1709	** Format strings for progress reporting.
1710

M src/zip.c

+2 -2

		--- src/zip.c
		+++ src/zip.c
		@@ -573,11 +573,11 @@
573	573	** COMMAND: test-filezip
574	574	**
575	575	** Generate a ZIP archive specified by the first argument that
576	576	** contains files given in the second and subsequent arguments.
577	577	*/
578		-void filezip_cmd(void){
	578	+void test_filezip_cmd(void){
579	579	int i;
580	580	Blob zip;
581	581	Blob file;
582	582	int eFType = SymFILE;
583	583	Archive sArchive;
		@@ -867,11 +867,11 @@
867	867	** ex=PATTERN Omit any file that match PATTERN. PATTERN is a
868	868	** comma-separated list of GLOB patterns, where each
869	869	** pattern can optionally be quoted using ".." or '..'.
870	870	** Any file matching both ex= and in= is excluded.
871	871	*/
872		-void baseline_zip_page(void){
	872	+void zip_page(void){
873	873	int rid;
874	874	const char *z;
875	875	char zName, zRid, *zKey;
876	876	int nName, nRid;
877	877	const char zInclude; / The in= query parameter */
878	878

	--- src/zip.c
	+++ src/zip.c
	@@ -573,11 +573,11 @@
573	** COMMAND: test-filezip
574	**
575	** Generate a ZIP archive specified by the first argument that
576	** contains files given in the second and subsequent arguments.
577	*/
578	void filezip_cmd(void){
579	int i;
580	Blob zip;
581	Blob file;
582	int eFType = SymFILE;
583	Archive sArchive;
	@@ -867,11 +867,11 @@
867	** ex=PATTERN Omit any file that match PATTERN. PATTERN is a
868	** comma-separated list of GLOB patterns, where each
869	** pattern can optionally be quoted using ".." or '..'.
870	** Any file matching both ex= and in= is excluded.
871	*/
872	void baseline_zip_page(void){
873	int rid;
874	const char *z;
875	char zName, zRid, *zKey;
876	int nName, nRid;
877	const char zInclude; / The in= query parameter */
878

	--- src/zip.c
	+++ src/zip.c
	@@ -573,11 +573,11 @@
573	** COMMAND: test-filezip
574	**
575	** Generate a ZIP archive specified by the first argument that
576	** contains files given in the second and subsequent arguments.
577	*/
578	void test_filezip_cmd(void){
579	int i;
580	Blob zip;
581	Blob file;
582	int eFType = SymFILE;
583	Archive sArchive;
	@@ -867,11 +867,11 @@
867	** ex=PATTERN Omit any file that match PATTERN. PATTERN is a
868	** comma-separated list of GLOB patterns, where each
869	** pattern can optionally be quoted using ".." or '..'.
870	** Any file matching both ex= and in= is excluded.
871	*/
872	void zip_page(void){
873	int rid;
874	const char *z;
875	char zName, zRid, *zKey;
876	int nName, nRid;
877	const char zInclude; / The in= query parameter */
878

Fossil SCM

Keyboard Shortcuts