Fossil SCM

More conversions of fossil_panic() into fossil_fatal().

drh 2018-08-07 13:28 UTC forum-v2

Commit 666b0ce6a797adc1d7646910f3f9ba580a98164a32ed83040a11f77d923364c9

Parent 342bd06b6a9a85f…

7 files changed +3 -3 +1 -1 +11 -11 +1 -1 +1 -1 +1 -1 +1 -1

~ src/db.c ~ src/dispatch.c ~ src/main.c ~ src/manifest.c ~ src/popen.c ~ src/skins.c ~ src/xfer.c

M src/db.c

+3 -3

		--- src/db.c
		+++ src/db.c
		@@ -1625,22 +1625,22 @@
1625	1625	if( file_access(zDbName, R_OK) \|\| file_size(zDbName, ExtFILE)<1024 ){
1626	1626	if( file_access(zDbName, F_OK) ){
1627	1627	#ifdef FOSSIL_ENABLE_JSON
1628	1628	g.json.resultCode = FSL_JSON_E_DB_NOT_FOUND;
1629	1629	#endif
1630		- fossil_panic("repository does not exist or"
	1630	+ fossil_fatal("repository does not exist or"
1631	1631	" is in an unreadable directory: %s", zDbName);
1632	1632	}else if( file_access(zDbName, R_OK) ){
1633	1633	#ifdef FOSSIL_ENABLE_JSON
1634	1634	g.json.resultCode = FSL_JSON_E_DENIED;
1635	1635	#endif
1636		- fossil_panic("read permission denied for repository %s", zDbName);
	1636	+ fossil_fatal("read permission denied for repository %s", zDbName);
1637	1637	}else{
1638	1638	#ifdef FOSSIL_ENABLE_JSON
1639	1639	g.json.resultCode = FSL_JSON_E_DB_NOT_VALID;
1640	1640	#endif
1641		- fossil_panic("not a valid repository: %s", zDbName);
	1641	+ fossil_fatal("not a valid repository: %s", zDbName);
1642	1642	}
1643	1643	}
1644	1644	g.zRepositoryName = mprintf("%s", zDbName);
1645	1645	db_open_or_attach(g.zRepositoryName, "repository");
1646	1646	g.repositoryOpen = 1;
1647	1647

	--- src/db.c
	+++ src/db.c
	@@ -1625,22 +1625,22 @@
1625	if( file_access(zDbName, R_OK) \|\| file_size(zDbName, ExtFILE)<1024 ){
1626	if( file_access(zDbName, F_OK) ){
1627	#ifdef FOSSIL_ENABLE_JSON
1628	g.json.resultCode = FSL_JSON_E_DB_NOT_FOUND;
1629	#endif
1630	fossil_panic("repository does not exist or"
1631	" is in an unreadable directory: %s", zDbName);
1632	}else if( file_access(zDbName, R_OK) ){
1633	#ifdef FOSSIL_ENABLE_JSON
1634	g.json.resultCode = FSL_JSON_E_DENIED;
1635	#endif
1636	fossil_panic("read permission denied for repository %s", zDbName);
1637	}else{
1638	#ifdef FOSSIL_ENABLE_JSON
1639	g.json.resultCode = FSL_JSON_E_DB_NOT_VALID;
1640	#endif
1641	fossil_panic("not a valid repository: %s", zDbName);
1642	}
1643	}
1644	g.zRepositoryName = mprintf("%s", zDbName);
1645	db_open_or_attach(g.zRepositoryName, "repository");
1646	g.repositoryOpen = 1;
1647

	--- src/db.c
	+++ src/db.c
	@@ -1625,22 +1625,22 @@
1625	if( file_access(zDbName, R_OK) \|\| file_size(zDbName, ExtFILE)<1024 ){
1626	if( file_access(zDbName, F_OK) ){
1627	#ifdef FOSSIL_ENABLE_JSON
1628	g.json.resultCode = FSL_JSON_E_DB_NOT_FOUND;
1629	#endif
1630	fossil_fatal("repository does not exist or"
1631	" is in an unreadable directory: %s", zDbName);
1632	}else if( file_access(zDbName, R_OK) ){
1633	#ifdef FOSSIL_ENABLE_JSON
1634	g.json.resultCode = FSL_JSON_E_DENIED;
1635	#endif
1636	fossil_fatal("read permission denied for repository %s", zDbName);
1637	}else{
1638	#ifdef FOSSIL_ENABLE_JSON
1639	g.json.resultCode = FSL_JSON_E_DB_NOT_VALID;
1640	#endif
1641	fossil_fatal("not a valid repository: %s", zDbName);
1642	}
1643	}
1644	g.zRepositoryName = mprintf("%s", zDbName);
1645	db_open_or_attach(g.zRepositoryName, "repository");
1646	g.repositoryOpen = 1;
1647

M src/dispatch.c

+1 -1

		--- src/dispatch.c
		+++ src/dispatch.c
		@@ -167,11 +167,11 @@
167	167	zQ = &z[i+1];
168	168	}else{
169	169	zQ = &z[i];
170	170	}
171	171	if( dispatch_name_search(z, CMDFLAG_WEBPAGE, ppCmd) ){
172		- fossil_panic("\"%s\" aliased to \"%s\" but \"%s\" does not exist",
	172	+ fossil_fatal("\"%s\" aliased to \"%s\" but \"%s\" does not exist",
173	173	zName, z, z);
174	174	}
175	175	z = zQ;
176	176	while( *z ){
177	177	char *zName = z;
178	178

	--- src/dispatch.c
	+++ src/dispatch.c
	@@ -167,11 +167,11 @@
167	zQ = &z[i+1];
168	}else{
169	zQ = &z[i];
170	}
171	if( dispatch_name_search(z, CMDFLAG_WEBPAGE, ppCmd) ){
172	fossil_panic("\"%s\" aliased to \"%s\" but \"%s\" does not exist",
173	zName, z, z);
174	}
175	z = zQ;
176	while( *z ){
177	char *zName = z;
178

	--- src/dispatch.c
	+++ src/dispatch.c
	@@ -167,11 +167,11 @@
167	zQ = &z[i+1];
168	}else{
169	zQ = &z[i];
170	}
171	if( dispatch_name_search(z, CMDFLAG_WEBPAGE, ppCmd) ){
172	fossil_fatal("\"%s\" aliased to \"%s\" but \"%s\" does not exist",
173	zName, z, z);
174	}
175	z = zQ;
176	while( *z ){
177	char *zName = z;
178

M src/main.c

+11 -11

		--- src/main.c
		+++ src/main.c
		@@ -640,11 +640,11 @@
640	640	if( g.zVfsName ){
641	641	sqlite3_vfs *pVfs = sqlite3_vfs_find(g.zVfsName);
642	642	if( pVfs ){
643	643	sqlite3_vfs_register(pVfs, 1);
644	644	}else{
645		- fossil_panic("no such VFS: \"%s\"", g.zVfsName);
	645	+ fossil_fatal("no such VFS: \"%s\"", g.zVfsName);
646	646	}
647	647	}
648	648	if( fossil_getenv("GATEWAY_INTERFACE")!=0 && !find_option("nocgi", 0, 0)){
649	649	zCmdName = "cgi";
650	650	g.isHTTP = 1;
		@@ -691,11 +691,11 @@
691	691	g.zErrlog = find_option("errorlog", 0, 1);
692	692	fossil_init_flags_from_options();
693	693	if( find_option("utc",0,0) ) g.fTimeFormat = 1;
694	694	if( find_option("localtime",0,0) ) g.fTimeFormat = 2;
695	695	if( zChdir && file_chdir(zChdir, 0) ){
696		- fossil_panic("unable to change directories to %s", zChdir);
	696	+ fossil_fatal("unable to change directories to %s", zChdir);
697	697	}
698	698	if( find_option("help",0,0)!=0 ){
699	699	/* If --help is found anywhere on the command line, translate the command
700	700	* to "fossil help cmdname" where "cmdname" is the first argument that
701	701	* does not begin with a "-" character. If all arguments start with "-",
		@@ -756,11 +756,11 @@
756	756	rc = TH_OK;
757	757	}
758	758	if( rc==TH_OK \|\| rc==TH_RETURN \|\| rc==TH_CONTINUE ){
759	759	if( rc==TH_OK \|\| rc==TH_RETURN ){
760	760	#endif
761		- fossil_panic("%s: unknown command: %s\n"
	761	+ fossil_fatal("%s: unknown command: %s\n"
762	762	"%s: use \"help\" for more information",
763	763	g.argv[0], zCmdName, g.argv[0]);
764	764	#ifdef FOSSIL_ENABLE_TH1_HOOKS
765	765	}
766	766	if( !g.isHTTP && !g.fNoThHook && (rc==TH_OK \|\| rc==TH_CONTINUE) ){
		@@ -821,11 +821,11 @@
821	821
822	822	/*
823	823	** Print a usage comment and quit
824	824	*/
825	825	void usage(const char *zFormat){
826		- fossil_panic("Usage: %s %s %s", g.argv[0], g.argv[1], zFormat);
	826	+ fossil_fatal("Usage: %s %s %s", g.argv[0], g.argv[1], zFormat);
827	827	}
828	828
829	829	/*
830	830	** Remove n elements from g.argv beginning with the i-th element.
831	831	*/
		@@ -939,11 +939,11 @@
939	939	*/
940	940	void verify_all_options(void){
941	941	int i;
942	942	for(i=1; i<g.argc; i++){
943	943	if( g.argv[i][0]=='-' && g.argv[i][1]!=0 ){
944		- fossil_panic(
	944	+ fossil_fatal(
945	945	"unrecognized command-line option, or missing argument: %s",
946	946	g.argv[i]);
947	947	}
948	948	}
949	949	}
		@@ -1158,11 +1158,11 @@
1158	1158	g.zHttpsURL = mprintf("https://%s", &g.zTop[7]);
1159	1159	}else if( strncmp(g.zTop, "https://", 8)==0 ){
1160	1160	/* it is already HTTPS, use it. */
1161	1161	g.zHttpsURL = mprintf("%s", g.zTop);
1162	1162	}else{
1163		- fossil_panic("argument to --baseurl should be 'http://host/path'"
	1163	+ fossil_fatal("argument to --baseurl should be 'http://host/path'"
1164	1164	" or 'https://host/path'");
1165	1165	}
1166	1166	for(i=n=0; (c = g.zTop[i])!=0; i++){
1167	1167	if( c=='/' ){
1168	1168	n++;
		@@ -1171,11 +1171,11 @@
1171	1171	break;
1172	1172	}
1173	1173	}
1174	1174	}
1175	1175	if( g.zTop==g.zBaseURL ){
1176		- fossil_panic("argument to --baseurl should be 'http://host/path'"
	1176	+ fossil_fatal("argument to --baseurl should be 'http://host/path'"
1177	1177	" or 'https://host/path'");
1178	1178	}
1179	1179	if( g.zTop[1]==0 ) g.zTop++;
1180	1180	}else{
1181	1181	zHost = PD("HTTP_HOST","");
		@@ -1260,16 +1260,16 @@
1260	1260	}
1261	1261	zRepo = &zDir[i];
1262	1262	}
1263	1263	}
1264	1264	if( stat(zRepo, &sStat)!=0 ){
1265		- fossil_panic("cannot stat() repository: %s", zRepo);
	1265	+ fossil_fatal("cannot stat() repository: %s", zRepo);
1266	1266	}
1267	1267	i = setgid(sStat.st_gid);
1268	1268	i = i \|\| setuid(sStat.st_uid);
1269	1269	if(i){
1270		- fossil_panic("setgid/uid() failed with errno %d", errno);
	1270	+ fossil_fatal("setgid/uid() failed with errno %d", errno);
1271	1271	}
1272	1272	if( g.db==0 && file_isfile(zRepo, ExtFILE) ){
1273	1273	db_open_repository(zRepo);
1274	1274	}
1275	1275	}
		@@ -2251,11 +2251,11 @@
2251	2251	){
2252	2252	unsigned int nSize = 0;
2253	2253	if( sscanf(zPidKey, "%lu:%p:%u", pProcessId, ppAddress, &nSize)==3 ){
2254	2254	*pnSize = (SIZE_T)nSize;
2255	2255	}else{
2256		- fossil_panic("failed to parse pid key");
	2256	+ fossil_fatal("failed to parse pid key");
2257	2257	}
2258	2258	}
2259	2259	#endif
2260	2260
2261	2261	/*
		@@ -2702,11 +2702,11 @@
2702	2702	}
2703	2703	if( g.repositoryOpen ) flags \|= HTTP_SERVER_HAD_REPOSITORY;
2704	2704	if( g.localOpen ) flags \|= HTTP_SERVER_HAD_CHECKOUT;
2705	2705	db_close(1);
2706	2706	if( cgi_http_server(iPort, mxPort, zBrowserCmd, zIpAddr, flags) ){
2707		- fossil_panic("unable to listen on TCP socket %d", iPort);
	2707	+ fossil_fatal("unable to listen on TCP socket %d", iPort);
2708	2708	}
2709	2709	if( zMaxLatency ){
2710	2710	signal(SIGALRM, sigalrm_handler);
2711	2711	alarm(atoi(zMaxLatency));
2712	2712	}
2713	2713

	--- src/main.c
	+++ src/main.c
	@@ -640,11 +640,11 @@
640	if( g.zVfsName ){
641	sqlite3_vfs *pVfs = sqlite3_vfs_find(g.zVfsName);
642	if( pVfs ){
643	sqlite3_vfs_register(pVfs, 1);
644	}else{
645	fossil_panic("no such VFS: \"%s\"", g.zVfsName);
646	}
647	}
648	if( fossil_getenv("GATEWAY_INTERFACE")!=0 && !find_option("nocgi", 0, 0)){
649	zCmdName = "cgi";
650	g.isHTTP = 1;
	@@ -691,11 +691,11 @@
691	g.zErrlog = find_option("errorlog", 0, 1);
692	fossil_init_flags_from_options();
693	if( find_option("utc",0,0) ) g.fTimeFormat = 1;
694	if( find_option("localtime",0,0) ) g.fTimeFormat = 2;
695	if( zChdir && file_chdir(zChdir, 0) ){
696	fossil_panic("unable to change directories to %s", zChdir);
697	}
698	if( find_option("help",0,0)!=0 ){
699	/* If --help is found anywhere on the command line, translate the command
700	* to "fossil help cmdname" where "cmdname" is the first argument that
701	* does not begin with a "-" character. If all arguments start with "-",
	@@ -756,11 +756,11 @@
756	rc = TH_OK;
757	}
758	if( rc==TH_OK \|\| rc==TH_RETURN \|\| rc==TH_CONTINUE ){
759	if( rc==TH_OK \|\| rc==TH_RETURN ){
760	#endif
761	fossil_panic("%s: unknown command: %s\n"
762	"%s: use \"help\" for more information",
763	g.argv[0], zCmdName, g.argv[0]);
764	#ifdef FOSSIL_ENABLE_TH1_HOOKS
765	}
766	if( !g.isHTTP && !g.fNoThHook && (rc==TH_OK \|\| rc==TH_CONTINUE) ){
	@@ -821,11 +821,11 @@
821
822	/*
823	** Print a usage comment and quit
824	*/
825	void usage(const char *zFormat){
826	fossil_panic("Usage: %s %s %s", g.argv[0], g.argv[1], zFormat);
827	}
828
829	/*
830	** Remove n elements from g.argv beginning with the i-th element.
831	*/
	@@ -939,11 +939,11 @@
939	*/
940	void verify_all_options(void){
941	int i;
942	for(i=1; i<g.argc; i++){
943	if( g.argv[i][0]=='-' && g.argv[i][1]!=0 ){
944	fossil_panic(
945	"unrecognized command-line option, or missing argument: %s",
946	g.argv[i]);
947	}
948	}
949	}
	@@ -1158,11 +1158,11 @@
1158	g.zHttpsURL = mprintf("https://%s", &g.zTop[7]);
1159	}else if( strncmp(g.zTop, "https://", 8)==0 ){
1160	/* it is already HTTPS, use it. */
1161	g.zHttpsURL = mprintf("%s", g.zTop);
1162	}else{
1163	fossil_panic("argument to --baseurl should be 'http://host/path'"
1164	" or 'https://host/path'");
1165	}
1166	for(i=n=0; (c = g.zTop[i])!=0; i++){
1167	if( c=='/' ){
1168	n++;
	@@ -1171,11 +1171,11 @@
1171	break;
1172	}
1173	}
1174	}
1175	if( g.zTop==g.zBaseURL ){
1176	fossil_panic("argument to --baseurl should be 'http://host/path'"
1177	" or 'https://host/path'");
1178	}
1179	if( g.zTop[1]==0 ) g.zTop++;
1180	}else{
1181	zHost = PD("HTTP_HOST","");
	@@ -1260,16 +1260,16 @@
1260	}
1261	zRepo = &zDir[i];
1262	}
1263	}
1264	if( stat(zRepo, &sStat)!=0 ){
1265	fossil_panic("cannot stat() repository: %s", zRepo);
1266	}
1267	i = setgid(sStat.st_gid);
1268	i = i \|\| setuid(sStat.st_uid);
1269	if(i){
1270	fossil_panic("setgid/uid() failed with errno %d", errno);
1271	}
1272	if( g.db==0 && file_isfile(zRepo, ExtFILE) ){
1273	db_open_repository(zRepo);
1274	}
1275	}
	@@ -2251,11 +2251,11 @@
2251	){
2252	unsigned int nSize = 0;
2253	if( sscanf(zPidKey, "%lu:%p:%u", pProcessId, ppAddress, &nSize)==3 ){
2254	*pnSize = (SIZE_T)nSize;
2255	}else{
2256	fossil_panic("failed to parse pid key");
2257	}
2258	}
2259	#endif
2260
2261	/*
	@@ -2702,11 +2702,11 @@
2702	}
2703	if( g.repositoryOpen ) flags \|= HTTP_SERVER_HAD_REPOSITORY;
2704	if( g.localOpen ) flags \|= HTTP_SERVER_HAD_CHECKOUT;
2705	db_close(1);
2706	if( cgi_http_server(iPort, mxPort, zBrowserCmd, zIpAddr, flags) ){
2707	fossil_panic("unable to listen on TCP socket %d", iPort);
2708	}
2709	if( zMaxLatency ){
2710	signal(SIGALRM, sigalrm_handler);
2711	alarm(atoi(zMaxLatency));
2712	}
2713

	--- src/main.c
	+++ src/main.c
	@@ -640,11 +640,11 @@
640	if( g.zVfsName ){
641	sqlite3_vfs *pVfs = sqlite3_vfs_find(g.zVfsName);
642	if( pVfs ){
643	sqlite3_vfs_register(pVfs, 1);
644	}else{
645	fossil_fatal("no such VFS: \"%s\"", g.zVfsName);
646	}
647	}
648	if( fossil_getenv("GATEWAY_INTERFACE")!=0 && !find_option("nocgi", 0, 0)){
649	zCmdName = "cgi";
650	g.isHTTP = 1;
	@@ -691,11 +691,11 @@
691	g.zErrlog = find_option("errorlog", 0, 1);
692	fossil_init_flags_from_options();
693	if( find_option("utc",0,0) ) g.fTimeFormat = 1;
694	if( find_option("localtime",0,0) ) g.fTimeFormat = 2;
695	if( zChdir && file_chdir(zChdir, 0) ){
696	fossil_fatal("unable to change directories to %s", zChdir);
697	}
698	if( find_option("help",0,0)!=0 ){
699	/* If --help is found anywhere on the command line, translate the command
700	* to "fossil help cmdname" where "cmdname" is the first argument that
701	* does not begin with a "-" character. If all arguments start with "-",
	@@ -756,11 +756,11 @@
756	rc = TH_OK;
757	}
758	if( rc==TH_OK \|\| rc==TH_RETURN \|\| rc==TH_CONTINUE ){
759	if( rc==TH_OK \|\| rc==TH_RETURN ){
760	#endif
761	fossil_fatal("%s: unknown command: %s\n"
762	"%s: use \"help\" for more information",
763	g.argv[0], zCmdName, g.argv[0]);
764	#ifdef FOSSIL_ENABLE_TH1_HOOKS
765	}
766	if( !g.isHTTP && !g.fNoThHook && (rc==TH_OK \|\| rc==TH_CONTINUE) ){
	@@ -821,11 +821,11 @@
821
822	/*
823	** Print a usage comment and quit
824	*/
825	void usage(const char *zFormat){
826	fossil_fatal("Usage: %s %s %s", g.argv[0], g.argv[1], zFormat);
827	}
828
829	/*
830	** Remove n elements from g.argv beginning with the i-th element.
831	*/
	@@ -939,11 +939,11 @@
939	*/
940	void verify_all_options(void){
941	int i;
942	for(i=1; i<g.argc; i++){
943	if( g.argv[i][0]=='-' && g.argv[i][1]!=0 ){
944	fossil_fatal(
945	"unrecognized command-line option, or missing argument: %s",
946	g.argv[i]);
947	}
948	}
949	}
	@@ -1158,11 +1158,11 @@
1158	g.zHttpsURL = mprintf("https://%s", &g.zTop[7]);
1159	}else if( strncmp(g.zTop, "https://", 8)==0 ){
1160	/* it is already HTTPS, use it. */
1161	g.zHttpsURL = mprintf("%s", g.zTop);
1162	}else{
1163	fossil_fatal("argument to --baseurl should be 'http://host/path'"
1164	" or 'https://host/path'");
1165	}
1166	for(i=n=0; (c = g.zTop[i])!=0; i++){
1167	if( c=='/' ){
1168	n++;
	@@ -1171,11 +1171,11 @@
1171	break;
1172	}
1173	}
1174	}
1175	if( g.zTop==g.zBaseURL ){
1176	fossil_fatal("argument to --baseurl should be 'http://host/path'"
1177	" or 'https://host/path'");
1178	}
1179	if( g.zTop[1]==0 ) g.zTop++;
1180	}else{
1181	zHost = PD("HTTP_HOST","");
	@@ -1260,16 +1260,16 @@
1260	}
1261	zRepo = &zDir[i];
1262	}
1263	}
1264	if( stat(zRepo, &sStat)!=0 ){
1265	fossil_fatal("cannot stat() repository: %s", zRepo);
1266	}
1267	i = setgid(sStat.st_gid);
1268	i = i \|\| setuid(sStat.st_uid);
1269	if(i){
1270	fossil_fatal("setgid/uid() failed with errno %d", errno);
1271	}
1272	if( g.db==0 && file_isfile(zRepo, ExtFILE) ){
1273	db_open_repository(zRepo);
1274	}
1275	}
	@@ -2251,11 +2251,11 @@
2251	){
2252	unsigned int nSize = 0;
2253	if( sscanf(zPidKey, "%lu:%p:%u", pProcessId, ppAddress, &nSize)==3 ){
2254	*pnSize = (SIZE_T)nSize;
2255	}else{
2256	fossil_fatal("failed to parse pid key");
2257	}
2258	}
2259	#endif
2260
2261	/*
	@@ -2702,11 +2702,11 @@
2702	}
2703	if( g.repositoryOpen ) flags \|= HTTP_SERVER_HAD_REPOSITORY;
2704	if( g.localOpen ) flags \|= HTTP_SERVER_HAD_CHECKOUT;
2705	db_close(1);
2706	if( cgi_http_server(iPort, mxPort, zBrowserCmd, zIpAddr, flags) ){
2707	fossil_fatal("unable to listen on TCP socket %d", iPort);
2708	}
2709	if( zMaxLatency ){
2710	signal(SIGALRM, sigalrm_handler);
2711	alarm(atoi(zMaxLatency));
2712	}
2713

M src/manifest.c

+1 -1

		--- src/manifest.c
		+++ src/manifest.c
		@@ -1193,11 +1193,11 @@
1193	1193	"INSERT OR IGNORE INTO orphan(rid, baseline) VALUES(%d,%d)",
1194	1194	p->rid, rid
1195	1195	);
1196	1196	return 1;
1197	1197	}
1198		- fossil_panic("cannot access baseline manifest %S", p->zBaseline);
	1198	+ fossil_fatal("cannot access baseline manifest %S", p->zBaseline);
1199	1199	}
1200	1200	}
1201	1201	return 0;
1202	1202	}
1203	1203
1204	1204

	--- src/manifest.c
	+++ src/manifest.c
	@@ -1193,11 +1193,11 @@
1193	"INSERT OR IGNORE INTO orphan(rid, baseline) VALUES(%d,%d)",
1194	p->rid, rid
1195	);
1196	return 1;
1197	}
1198	fossil_panic("cannot access baseline manifest %S", p->zBaseline);
1199	}
1200	}
1201	return 0;
1202	}
1203
1204

	--- src/manifest.c
	+++ src/manifest.c
	@@ -1193,11 +1193,11 @@
1193	"INSERT OR IGNORE INTO orphan(rid, baseline) VALUES(%d,%d)",
1194	p->rid, rid
1195	);
1196	return 1;
1197	}
1198	fossil_fatal("cannot access baseline manifest %S", p->zBaseline);
1199	}
1200	}
1201	return 0;
1202	}
1203
1204

M src/popen.c

+1 -1

		--- src/popen.c
		+++ src/popen.c
		@@ -25,11 +25,11 @@
25	25	#include <fcntl.h>
26	26	/*
27	27	** Print a fatal error and quit.
28	28	*/
29	29	static void win32_fatal_error(const char *zMsg){
30		- fossil_panic("%s", zMsg);
	30	+ fossil_fatal("%s", zMsg);
31	31	}
32	32	#else
33	33	#include <signal.h>
34	34	#include <sys/wait.h>
35	35	#endif
36	36

	--- src/popen.c
	+++ src/popen.c
	@@ -25,11 +25,11 @@
25	#include <fcntl.h>
26	/*
27	** Print a fatal error and quit.
28	*/
29	static void win32_fatal_error(const char *zMsg){
30	fossil_panic("%s", zMsg);
31	}
32	#else
33	#include <signal.h>
34	#include <sys/wait.h>
35	#endif
36

	--- src/popen.c
	+++ src/popen.c
	@@ -25,11 +25,11 @@
25	#include <fcntl.h>
26	/*
27	** Print a fatal error and quit.
28	*/
29	static void win32_fatal_error(const char *zMsg){
30	fossil_fatal("%s", zMsg);
31	}
32	#else
33	#include <signal.h>
34	#include <sys/wait.h>
35	#endif
36

M src/skins.c

+1 -1

		--- src/skins.c
		+++ src/skins.c
		@@ -254,11 +254,11 @@
254	254	*/
255	255	const char skin_detail(const char zName){
256	256	struct SkinDetail *pDetail;
257	257	skin_detail_initialize();
258	258	pDetail = skin_detail_find(zName);
259		- if( pDetail==0 ) fossil_panic("no such skin detail: %s", zName);
	259	+ if( pDetail==0 ) fossil_fatal("no such skin detail: %s", zName);
260	260	return pDetail->zValue;
261	261	}
262	262	int skin_detail_boolean(const char *zName){
263	263	return !is_false(skin_detail(zName));
264	264	}
265	265

	--- src/skins.c
	+++ src/skins.c
	@@ -254,11 +254,11 @@
254	*/
255	const char skin_detail(const char zName){
256	struct SkinDetail *pDetail;
257	skin_detail_initialize();
258	pDetail = skin_detail_find(zName);
259	if( pDetail==0 ) fossil_panic("no such skin detail: %s", zName);
260	return pDetail->zValue;
261	}
262	int skin_detail_boolean(const char *zName){
263	return !is_false(skin_detail(zName));
264	}
265

	--- src/skins.c
	+++ src/skins.c
	@@ -254,11 +254,11 @@
254	*/
255	const char skin_detail(const char zName){
256	struct SkinDetail *pDetail;
257	skin_detail_initialize();
258	pDetail = skin_detail_find(zName);
259	if( pDetail==0 ) fossil_fatal("no such skin detail: %s", zName);
260	return pDetail->zValue;
261	}
262	int skin_detail_boolean(const char *zName){
263	return !is_false(skin_detail(zName));
264	}
265

M src/xfer.c

+1 -1

		--- src/xfer.c
		+++ src/xfer.c
		@@ -1306,11 +1306,11 @@
1306	1306	&& blob_is_hname(&xfer.aToken[2])
1307	1307	){
1308	1308	const char *zPCode;
1309	1309	zPCode = db_get("project-code", 0);
1310	1310	if( zPCode==0 ){
1311		- fossil_panic("missing project code");
	1311	+ fossil_fatal("missing project code");
1312	1312	}
1313	1313	if( !blob_eq_str(&xfer.aToken[2], zPCode, -1) ){
1314	1314	cgi_reset_content();
1315	1315	@ error wrong\sproject
1316	1316	nErr++;
1317	1317

	--- src/xfer.c
	+++ src/xfer.c
	@@ -1306,11 +1306,11 @@
1306	&& blob_is_hname(&xfer.aToken[2])
1307	){
1308	const char *zPCode;
1309	zPCode = db_get("project-code", 0);
1310	if( zPCode==0 ){
1311	fossil_panic("missing project code");
1312	}
1313	if( !blob_eq_str(&xfer.aToken[2], zPCode, -1) ){
1314	cgi_reset_content();
1315	@ error wrong\sproject
1316	nErr++;
1317

	--- src/xfer.c
	+++ src/xfer.c
	@@ -1306,11 +1306,11 @@
1306	&& blob_is_hname(&xfer.aToken[2])
1307	){
1308	const char *zPCode;
1309	zPCode = db_get("project-code", 0);
1310	if( zPCode==0 ){
1311	fossil_fatal("missing project code");
1312	}
1313	if( !blob_eq_str(&xfer.aToken[2], zPCode, -1) ){
1314	cgi_reset_content();
1315	@ error wrong\sproject
1316	nErr++;
1317

Fossil SCM

Keyboard Shortcuts