Fossil SCM

Eliminate some unnecessary variables. Eliminate some (harmless) compiler warnings with gcc 4.8.1. Remove some spaces at the end of lines. No functional changes.

jan.nijtmans 2013-08-20 08:08 trunk

Commit 4e092e0f15a6da8eff0c62e22986b4e6e0764730

Parent 187845b5746ec92…

6 files changed +20 -23 +5 -5 +1 -1 +3 -3 +1 -1 +1 -1

~ src/checkin.c ~ src/http_transport.c ~ src/manifest.c ~ src/style.c ~ src/th.c ~ src/unicode.c

M src/checkin.c

+20 -23

		--- src/checkin.c
		+++ src/checkin.c
		@@ -901,12 +901,11 @@
901	901	){
902	902	char zDate; / Date of the check-in */
903	903	char zParentUuid; / UUID of parent check-in */
904	904	Blob filename; /* A single filename */
905	905	int nBasename; /* Size of base filename */
906		- Stmt q; /* Query of files changed */
907		- Stmt q2; /* Query of merge parents */
	906	+ Stmt q; /* Various queries */
908	907	Blob mcksum; /* Manifest checksum */
909	908	ManifestFile pFile; / File from the baseline */
910	909	int nFBcard = 0; /* Number of B-cards and F-cards */
911	910	int i; /* Loop counter */
912	911	const char zColor; / Modified value of p->zColor */
		@@ -1006,37 +1005,37 @@
1006	1005	blob_appendf(pOut, "N %F\n", p->zMimetype);
1007	1006	}
1008	1007	blob_appendf(pOut, "P %s", zParentUuid);
1009	1008	if( p->verifyDate ) checkin_verify_younger(vid, zParentUuid, zDate);
1010	1009	free(zParentUuid);
1011		- db_prepare(&q2, "SELECT merge FROM vmerge WHERE id=0 OR id<-2");
1012		- while( db_step(&q2)==SQLITE_ROW ){
	1010	+ db_prepare(&q, "SELECT merge FROM vmerge WHERE id=0 OR id<-2");
	1011	+ while( db_step(&q)==SQLITE_ROW ){
1013	1012	char *zMergeUuid;
1014		- int mid = db_column_int(&q2, 0);
	1013	+ int mid = db_column_int(&q, 0);
1015	1014	if( !g.markPrivate && content_is_private(mid) ) continue;
1016	1015	zMergeUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", mid);
1017	1016	if( zMergeUuid ){
1018	1017	blob_appendf(pOut, " %s", zMergeUuid);
1019	1018	if( p->verifyDate ) checkin_verify_younger(mid, zMergeUuid, zDate);
1020	1019	free(zMergeUuid);
1021	1020	}
1022	1021	}
1023		- db_finalize(&q2);
	1022	+ db_finalize(&q);
1024	1023	free(zDate);
1025	1024	blob_appendf(pOut, "\n");
1026	1025
1027		- db_prepare(&q2,
	1026	+ db_prepare(&q,
1028	1027	"SELECT CASE vmerge.id WHEN -1 THEN '+' ELSE '-' END \|\| blob.uuid"
1029	1028	" FROM vmerge, blob"
1030	1029	" WHERE (vmerge.id=-1 OR vmerge.id=-2)"
1031	1030	" AND blob.rid=vmerge.merge"
1032	1031	" ORDER BY 1");
1033		- while( db_step(&q2)==SQLITE_ROW ){
1034		- const char *zCherrypickUuid = db_column_text(&q2, 0);
	1032	+ while( db_step(&q)==SQLITE_ROW ){
	1033	+ const char *zCherrypickUuid = db_column_text(&q, 0);
1035	1034	blob_appendf(pOut, "Q %s\n", zCherrypickUuid);
1036	1035	}
1037		- db_finalize(&q2);
	1036	+ db_finalize(&q);
1038	1037
1039	1038	if( p->pCksum ) blob_appendf(pOut, "R %b\n", p->pCksum);
1040	1039	zColor = p->zColor;
1041	1040	if( p->zBranch && p->zBranch[0] ){
1042	1041	/* Set tags for the new branch */
		@@ -1049,21 +1048,21 @@
1049	1048	}
1050	1049	if( zColor && zColor[0] ){
1051	1050	/* One-time background color */
1052	1051	blob_appendf(pOut, "T +bgcolor * %F\n", zColor);
1053	1052	}
1054		- db_prepare(&q2, "SELECT uuid,merge FROM vmerge JOIN blob ON merge=rid"
	1053	+ db_prepare(&q, "SELECT uuid,merge FROM vmerge JOIN blob ON merge=rid"
1055	1054	" WHERE id=-4 ORDER BY 1");
1056		- while( db_step(&q2)==SQLITE_ROW ){
1057		- const char *zIntegrateUuid = db_column_text(&q2, 0);
1058		- int rid = db_column_int(&q2, 1);
	1055	+ while( db_step(&q)==SQLITE_ROW ){
	1056	+ const char *zIntegrateUuid = db_column_text(&q, 0);
	1057	+ int rid = db_column_int(&q, 1);
1059	1058	if( is_a_leaf(rid) && !db_exists("SELECT 1 FROM tagxref "
1060	1059	" WHERE tagid=%d AND rid=%d AND tagtype>0", TAG_CLOSED, rid)){
1061	1060	blob_appendf(pOut, "T +closed %s\n", zIntegrateUuid);
1062	1061	}
1063	1062	}
1064		- db_finalize(&q2);
	1063	+ db_finalize(&q);
1065	1064
1066	1065	if( p->azTag ){
1067	1066	for(i=0; p->azTag[i]; i++){
1068	1067	/* Add a symbolic tag to this check-in. The tag names have already
1069	1068	** been sorted and converted using the %F format */
		@@ -1071,11 +1070,10 @@
1071	1070	blob_appendf(pOut, "T +sym-%s *\n", p->azTag[i]);
1072	1071	}
1073	1072	}
1074	1073	if( p->zBranch && p->zBranch[0] ){
1075	1074	/* For a new branch, cancel all prior propagating tags */
1076		- Stmt q;
1077	1075	db_prepare(&q,
1078	1076	"SELECT tagname FROM tagxref, tag"
1079	1077	" WHERE tagxref.rid=%d AND tagxref.tagid=tag.tagid"
1080	1078	" AND tagtype==2 AND tagname GLOB 'sym-*'"
1081	1079	" AND tagname!='sym-'\|\|%Q"
		@@ -1310,11 +1308,11 @@
1310	1308	int vid; /* blob-id of parent version */
1311	1309	int nrid; /* blob-id of a modified file */
1312	1310	int nvid; /* Blob-id of the new check-in */
1313	1311	Blob comment; /* Check-in comment */
1314	1312	const char zComment; / Check-in comment */
1315		- Stmt q; /* Query to find files that have been modified */
	1313	+ Stmt q; /* Various queries */
1316	1314	char zUuid; / UUID of the new check-in */
1317	1315	int noSign = 0; /* True to omit signing the manifest using GPG */
1318	1316	int isAMerge = 0; /* True if checking in a merge */
1319	1317	int noWarningFlag = 0; /* True if skipping all warnings */
1320	1318	int forceFlag = 0; /* Undocumented: Disables all checks */
		@@ -1463,25 +1461,24 @@
1463	1461	** will generate a manifest that has two fileA entries, which is illegal.
1464	1462	** When you think about it, the sequence above makes no sense. So detect
1465	1463	** it and disallow it. Ticket [0ff64b0a5fc8].
1466	1464	*/
1467	1465	if( g.aCommitFile ){
1468		- Stmt qRename;
1469		- db_prepare(&qRename,
	1466	+ db_prepare(&q,
1470	1467	"SELECT v1.pathname, v2.pathname"
1471	1468	" FROM vfile AS v1, vfile AS v2"
1472	1469	" WHERE is_selected(v1.id)"
1473	1470	" AND v2.origname IS NOT NULL"
1474	1471	" AND v2.origname=v1.pathname"
1475	1472	" AND NOT is_selected(v2.id)");
1476		- if( db_step(&qRename)==SQLITE_ROW ){
1477		- const char *zFrom = db_column_text(&qRename, 0);
1478		- const char *zTo = db_column_text(&qRename, 1);
	1473	+ if( db_step(&q)==SQLITE_ROW ){
	1474	+ const char *zFrom = db_column_text(&q, 0);
	1475	+ const char *zTo = db_column_text(&q, 1);
1479	1476	fossil_fatal("cannot do a partial commit of '%s' without '%s' because "
1480	1477	"'%s' was renamed to '%s'", zFrom, zTo, zFrom, zTo);
1481	1478	}
1482		- db_finalize(&qRename);
	1479	+ db_finalize(&q);
1483	1480	}
1484	1481
1485	1482	user_select();
1486	1483	/*
1487	1484	** Check that the user exists.
1488	1485

	--- src/checkin.c
	+++ src/checkin.c
	@@ -901,12 +901,11 @@
901	){
902	char zDate; / Date of the check-in */
903	char zParentUuid; / UUID of parent check-in */
904	Blob filename; /* A single filename */
905	int nBasename; /* Size of base filename */
906	Stmt q; /* Query of files changed */
907	Stmt q2; /* Query of merge parents */
908	Blob mcksum; /* Manifest checksum */
909	ManifestFile pFile; / File from the baseline */
910	int nFBcard = 0; /* Number of B-cards and F-cards */
911	int i; /* Loop counter */
912	const char zColor; / Modified value of p->zColor */
	@@ -1006,37 +1005,37 @@
1006	blob_appendf(pOut, "N %F\n", p->zMimetype);
1007	}
1008	blob_appendf(pOut, "P %s", zParentUuid);
1009	if( p->verifyDate ) checkin_verify_younger(vid, zParentUuid, zDate);
1010	free(zParentUuid);
1011	db_prepare(&q2, "SELECT merge FROM vmerge WHERE id=0 OR id<-2");
1012	while( db_step(&q2)==SQLITE_ROW ){
1013	char *zMergeUuid;
1014	int mid = db_column_int(&q2, 0);
1015	if( !g.markPrivate && content_is_private(mid) ) continue;
1016	zMergeUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", mid);
1017	if( zMergeUuid ){
1018	blob_appendf(pOut, " %s", zMergeUuid);
1019	if( p->verifyDate ) checkin_verify_younger(mid, zMergeUuid, zDate);
1020	free(zMergeUuid);
1021	}
1022	}
1023	db_finalize(&q2);
1024	free(zDate);
1025	blob_appendf(pOut, "\n");
1026
1027	db_prepare(&q2,
1028	"SELECT CASE vmerge.id WHEN -1 THEN '+' ELSE '-' END \|\| blob.uuid"
1029	" FROM vmerge, blob"
1030	" WHERE (vmerge.id=-1 OR vmerge.id=-2)"
1031	" AND blob.rid=vmerge.merge"
1032	" ORDER BY 1");
1033	while( db_step(&q2)==SQLITE_ROW ){
1034	const char *zCherrypickUuid = db_column_text(&q2, 0);
1035	blob_appendf(pOut, "Q %s\n", zCherrypickUuid);
1036	}
1037	db_finalize(&q2);
1038
1039	if( p->pCksum ) blob_appendf(pOut, "R %b\n", p->pCksum);
1040	zColor = p->zColor;
1041	if( p->zBranch && p->zBranch[0] ){
1042	/* Set tags for the new branch */
	@@ -1049,21 +1048,21 @@
1049	}
1050	if( zColor && zColor[0] ){
1051	/* One-time background color */
1052	blob_appendf(pOut, "T +bgcolor * %F\n", zColor);
1053	}
1054	db_prepare(&q2, "SELECT uuid,merge FROM vmerge JOIN blob ON merge=rid"
1055	" WHERE id=-4 ORDER BY 1");
1056	while( db_step(&q2)==SQLITE_ROW ){
1057	const char *zIntegrateUuid = db_column_text(&q2, 0);
1058	int rid = db_column_int(&q2, 1);
1059	if( is_a_leaf(rid) && !db_exists("SELECT 1 FROM tagxref "
1060	" WHERE tagid=%d AND rid=%d AND tagtype>0", TAG_CLOSED, rid)){
1061	blob_appendf(pOut, "T +closed %s\n", zIntegrateUuid);
1062	}
1063	}
1064	db_finalize(&q2);
1065
1066	if( p->azTag ){
1067	for(i=0; p->azTag[i]; i++){
1068	/* Add a symbolic tag to this check-in. The tag names have already
1069	** been sorted and converted using the %F format */
	@@ -1071,11 +1070,10 @@
1071	blob_appendf(pOut, "T +sym-%s *\n", p->azTag[i]);
1072	}
1073	}
1074	if( p->zBranch && p->zBranch[0] ){
1075	/* For a new branch, cancel all prior propagating tags */
1076	Stmt q;
1077	db_prepare(&q,
1078	"SELECT tagname FROM tagxref, tag"
1079	" WHERE tagxref.rid=%d AND tagxref.tagid=tag.tagid"
1080	" AND tagtype==2 AND tagname GLOB 'sym-*'"
1081	" AND tagname!='sym-'\|\|%Q"
	@@ -1310,11 +1308,11 @@
1310	int vid; /* blob-id of parent version */
1311	int nrid; /* blob-id of a modified file */
1312	int nvid; /* Blob-id of the new check-in */
1313	Blob comment; /* Check-in comment */
1314	const char zComment; / Check-in comment */
1315	Stmt q; /* Query to find files that have been modified */
1316	char zUuid; / UUID of the new check-in */
1317	int noSign = 0; /* True to omit signing the manifest using GPG */
1318	int isAMerge = 0; /* True if checking in a merge */
1319	int noWarningFlag = 0; /* True if skipping all warnings */
1320	int forceFlag = 0; /* Undocumented: Disables all checks */
	@@ -1463,25 +1461,24 @@
1463	** will generate a manifest that has two fileA entries, which is illegal.
1464	** When you think about it, the sequence above makes no sense. So detect
1465	** it and disallow it. Ticket [0ff64b0a5fc8].
1466	*/
1467	if( g.aCommitFile ){
1468	Stmt qRename;
1469	db_prepare(&qRename,
1470	"SELECT v1.pathname, v2.pathname"
1471	" FROM vfile AS v1, vfile AS v2"
1472	" WHERE is_selected(v1.id)"
1473	" AND v2.origname IS NOT NULL"
1474	" AND v2.origname=v1.pathname"
1475	" AND NOT is_selected(v2.id)");
1476	if( db_step(&qRename)==SQLITE_ROW ){
1477	const char *zFrom = db_column_text(&qRename, 0);
1478	const char *zTo = db_column_text(&qRename, 1);
1479	fossil_fatal("cannot do a partial commit of '%s' without '%s' because "
1480	"'%s' was renamed to '%s'", zFrom, zTo, zFrom, zTo);
1481	}
1482	db_finalize(&qRename);
1483	}
1484
1485	user_select();
1486	/*
1487	** Check that the user exists.
1488

	--- src/checkin.c
	+++ src/checkin.c
	@@ -901,12 +901,11 @@
901	){
902	char zDate; / Date of the check-in */
903	char zParentUuid; / UUID of parent check-in */
904	Blob filename; /* A single filename */
905	int nBasename; /* Size of base filename */
906	Stmt q; /* Various queries */

907	Blob mcksum; /* Manifest checksum */
908	ManifestFile pFile; / File from the baseline */
909	int nFBcard = 0; /* Number of B-cards and F-cards */
910	int i; /* Loop counter */
911	const char zColor; / Modified value of p->zColor */
	@@ -1006,37 +1005,37 @@
1005	blob_appendf(pOut, "N %F\n", p->zMimetype);
1006	}
1007	blob_appendf(pOut, "P %s", zParentUuid);
1008	if( p->verifyDate ) checkin_verify_younger(vid, zParentUuid, zDate);
1009	free(zParentUuid);
1010	db_prepare(&q, "SELECT merge FROM vmerge WHERE id=0 OR id<-2");
1011	while( db_step(&q)==SQLITE_ROW ){
1012	char *zMergeUuid;
1013	int mid = db_column_int(&q, 0);
1014	if( !g.markPrivate && content_is_private(mid) ) continue;
1015	zMergeUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", mid);
1016	if( zMergeUuid ){
1017	blob_appendf(pOut, " %s", zMergeUuid);
1018	if( p->verifyDate ) checkin_verify_younger(mid, zMergeUuid, zDate);
1019	free(zMergeUuid);
1020	}
1021	}
1022	db_finalize(&q);
1023	free(zDate);
1024	blob_appendf(pOut, "\n");
1025
1026	db_prepare(&q,
1027	"SELECT CASE vmerge.id WHEN -1 THEN '+' ELSE '-' END \|\| blob.uuid"
1028	" FROM vmerge, blob"
1029	" WHERE (vmerge.id=-1 OR vmerge.id=-2)"
1030	" AND blob.rid=vmerge.merge"
1031	" ORDER BY 1");
1032	while( db_step(&q)==SQLITE_ROW ){
1033	const char *zCherrypickUuid = db_column_text(&q, 0);
1034	blob_appendf(pOut, "Q %s\n", zCherrypickUuid);
1035	}
1036	db_finalize(&q);
1037
1038	if( p->pCksum ) blob_appendf(pOut, "R %b\n", p->pCksum);
1039	zColor = p->zColor;
1040	if( p->zBranch && p->zBranch[0] ){
1041	/* Set tags for the new branch */
	@@ -1049,21 +1048,21 @@
1048	}
1049	if( zColor && zColor[0] ){
1050	/* One-time background color */
1051	blob_appendf(pOut, "T +bgcolor * %F\n", zColor);
1052	}
1053	db_prepare(&q, "SELECT uuid,merge FROM vmerge JOIN blob ON merge=rid"
1054	" WHERE id=-4 ORDER BY 1");
1055	while( db_step(&q)==SQLITE_ROW ){
1056	const char *zIntegrateUuid = db_column_text(&q, 0);
1057	int rid = db_column_int(&q, 1);
1058	if( is_a_leaf(rid) && !db_exists("SELECT 1 FROM tagxref "
1059	" WHERE tagid=%d AND rid=%d AND tagtype>0", TAG_CLOSED, rid)){
1060	blob_appendf(pOut, "T +closed %s\n", zIntegrateUuid);
1061	}
1062	}
1063	db_finalize(&q);
1064
1065	if( p->azTag ){
1066	for(i=0; p->azTag[i]; i++){
1067	/* Add a symbolic tag to this check-in. The tag names have already
1068	** been sorted and converted using the %F format */
	@@ -1071,11 +1070,10 @@
1070	blob_appendf(pOut, "T +sym-%s *\n", p->azTag[i]);
1071	}
1072	}
1073	if( p->zBranch && p->zBranch[0] ){
1074	/* For a new branch, cancel all prior propagating tags */

1075	db_prepare(&q,
1076	"SELECT tagname FROM tagxref, tag"
1077	" WHERE tagxref.rid=%d AND tagxref.tagid=tag.tagid"
1078	" AND tagtype==2 AND tagname GLOB 'sym-*'"
1079	" AND tagname!='sym-'\|\|%Q"
	@@ -1310,11 +1308,11 @@
1308	int vid; /* blob-id of parent version */
1309	int nrid; /* blob-id of a modified file */
1310	int nvid; /* Blob-id of the new check-in */
1311	Blob comment; /* Check-in comment */
1312	const char zComment; / Check-in comment */
1313	Stmt q; /* Various queries */
1314	char zUuid; / UUID of the new check-in */
1315	int noSign = 0; /* True to omit signing the manifest using GPG */
1316	int isAMerge = 0; /* True if checking in a merge */
1317	int noWarningFlag = 0; /* True if skipping all warnings */
1318	int forceFlag = 0; /* Undocumented: Disables all checks */
	@@ -1463,25 +1461,24 @@
1461	** will generate a manifest that has two fileA entries, which is illegal.
1462	** When you think about it, the sequence above makes no sense. So detect
1463	** it and disallow it. Ticket [0ff64b0a5fc8].
1464	*/
1465	if( g.aCommitFile ){
1466	db_prepare(&q,

1467	"SELECT v1.pathname, v2.pathname"
1468	" FROM vfile AS v1, vfile AS v2"
1469	" WHERE is_selected(v1.id)"
1470	" AND v2.origname IS NOT NULL"
1471	" AND v2.origname=v1.pathname"
1472	" AND NOT is_selected(v2.id)");
1473	if( db_step(&q)==SQLITE_ROW ){
1474	const char *zFrom = db_column_text(&q, 0);
1475	const char *zTo = db_column_text(&q, 1);
1476	fossil_fatal("cannot do a partial commit of '%s' without '%s' because "
1477	"'%s' was renamed to '%s'", zFrom, zTo, zFrom, zTo);
1478	}
1479	db_finalize(&q);
1480	}
1481
1482	user_select();
1483	/*
1484	** Check that the user exists.
1485

M src/http_transport.c

+5 -5

		--- src/http_transport.c
		+++ src/http_transport.c
		@@ -37,11 +37,11 @@
37	37	FILE pFile; / File I/O for FILE: */
38	38	char zOutFile; / Name of outbound file for FILE: */
39	39	char zInFile; / Name of inbound file for FILE: */
40	40	FILE pLog; / Log output here */
41	41	} transport = {
42		- 0, 0, 0, 0, 0, 0, 0
	42	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
43	43	};
44	44
45	45	/*
46	46	** Information about the connection to the SSH subprocess when
47	47	** using the ssh:// sync method.
		@@ -308,13 +308,13 @@
308	308	rc = 1;
309	309	#endif
310	310	}else if( g.urlIsFile ){
311	311	sqlite3_uint64 iRandId;
312	312	sqlite3_randomness(sizeof(iRandId), &iRandId);
313		- transport.zOutFile = mprintf("%s-%llu-out.http",
	313	+ transport.zOutFile = mprintf("%s-%llu-out.http",
314	314	g.zRepositoryName, iRandId);
315		- transport.zInFile = mprintf("%s-%llu-in.http",
	315	+ transport.zInFile = mprintf("%s-%llu-in.http",
316	316	g.zRepositoryName, iRandId);
317	317	transport.pFile = fossil_fopen(transport.zOutFile, "wb");
318	318	if( transport.pFile==0 ){
319	319	fossil_fatal("cannot output temporary file: %s", transport.zOutFile);
320	320	}
		@@ -346,11 +346,11 @@
346	346	}else if( g.urlIsHttps ){
347	347	#ifdef FOSSIL_ENABLE_SSL
348	348	ssl_close();
349	349	#endif
350	350	}else if( g.urlIsFile ){
351		- if( transport.pFile ){
	351	+ if( transport.pFile ){
352	352	fclose(transport.pFile);
353	353	transport.pFile = 0;
354	354	}
355	355	file_delete(transport.zInFile);
356	356	file_delete(transport.zOutFile);
		@@ -379,11 +379,11 @@
379	379	while( n>0 ){
380	380	sent = ssl_send(0, z, n);
381	381	/* printf("Sent %d of %d bytes\n", sent, n); fflush(stdout); */
382	382	if( sent<=0 ) break;
383	383	n -= sent;
384		- }
	384	+ }
385	385	#endif
386	386	}else if( g.urlIsFile ){
387	387	fwrite(z, 1, n, transport.pFile);
388	388	}else{
389	389	int sent;
390	390

	--- src/http_transport.c
	+++ src/http_transport.c
	@@ -37,11 +37,11 @@
37	FILE pFile; / File I/O for FILE: */
38	char zOutFile; / Name of outbound file for FILE: */
39	char zInFile; / Name of inbound file for FILE: */
40	FILE pLog; / Log output here */
41	} transport = {
42	0, 0, 0, 0, 0, 0, 0
43	};
44
45	/*
46	** Information about the connection to the SSH subprocess when
47	** using the ssh:// sync method.
	@@ -308,13 +308,13 @@
308	rc = 1;
309	#endif
310	}else if( g.urlIsFile ){
311	sqlite3_uint64 iRandId;
312	sqlite3_randomness(sizeof(iRandId), &iRandId);
313	transport.zOutFile = mprintf("%s-%llu-out.http",
314	g.zRepositoryName, iRandId);
315	transport.zInFile = mprintf("%s-%llu-in.http",
316	g.zRepositoryName, iRandId);
317	transport.pFile = fossil_fopen(transport.zOutFile, "wb");
318	if( transport.pFile==0 ){
319	fossil_fatal("cannot output temporary file: %s", transport.zOutFile);
320	}
	@@ -346,11 +346,11 @@
346	}else if( g.urlIsHttps ){
347	#ifdef FOSSIL_ENABLE_SSL
348	ssl_close();
349	#endif
350	}else if( g.urlIsFile ){
351	if( transport.pFile ){
352	fclose(transport.pFile);
353	transport.pFile = 0;
354	}
355	file_delete(transport.zInFile);
356	file_delete(transport.zOutFile);
	@@ -379,11 +379,11 @@
379	while( n>0 ){
380	sent = ssl_send(0, z, n);
381	/* printf("Sent %d of %d bytes\n", sent, n); fflush(stdout); */
382	if( sent<=0 ) break;
383	n -= sent;
384	}
385	#endif
386	}else if( g.urlIsFile ){
387	fwrite(z, 1, n, transport.pFile);
388	}else{
389	int sent;
390

	--- src/http_transport.c
	+++ src/http_transport.c
	@@ -37,11 +37,11 @@
37	FILE pFile; / File I/O for FILE: */
38	char zOutFile; / Name of outbound file for FILE: */
39	char zInFile; / Name of inbound file for FILE: */
40	FILE pLog; / Log output here */
41	} transport = {
42	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
43	};
44
45	/*
46	** Information about the connection to the SSH subprocess when
47	** using the ssh:// sync method.
	@@ -308,13 +308,13 @@
308	rc = 1;
309	#endif
310	}else if( g.urlIsFile ){
311	sqlite3_uint64 iRandId;
312	sqlite3_randomness(sizeof(iRandId), &iRandId);
313	transport.zOutFile = mprintf("%s-%llu-out.http",
314	g.zRepositoryName, iRandId);
315	transport.zInFile = mprintf("%s-%llu-in.http",
316	g.zRepositoryName, iRandId);
317	transport.pFile = fossil_fopen(transport.zOutFile, "wb");
318	if( transport.pFile==0 ){
319	fossil_fatal("cannot output temporary file: %s", transport.zOutFile);
320	}
	@@ -346,11 +346,11 @@
346	}else if( g.urlIsHttps ){
347	#ifdef FOSSIL_ENABLE_SSL
348	ssl_close();
349	#endif
350	}else if( g.urlIsFile ){
351	if( transport.pFile ){
352	fclose(transport.pFile);
353	transport.pFile = 0;
354	}
355	file_delete(transport.zInFile);
356	file_delete(transport.zOutFile);
	@@ -379,11 +379,11 @@
379	while( n>0 ){
380	sent = ssl_send(0, z, n);
381	/* printf("Sent %d of %d bytes\n", sent, n); fflush(stdout); */
382	if( sent<=0 ) break;
383	n -= sent;
384	}
385	#endif
386	}else if( g.urlIsFile ){
387	fwrite(z, 1, n, transport.pFile);
388	}else{
389	int sent;
390

M src/manifest.c

+1 -1

		--- src/manifest.c
		+++ src/manifest.c
		@@ -716,11 +716,11 @@
716	716	**
717	717	** Specify the MD5 checksum over the name and content of all files
718	718	** in the manifest.
719	719	*/
720	720	case 'R': {
721		- if( p->zRepoCksum!=0 ) SYNTAX("more than on R-card");
	721	+ if( p->zRepoCksum!=0 ) SYNTAX("more than one R-card");
722	722	p->zRepoCksum = next_token(&x, &sz);
723	723	if( sz!=32 ) SYNTAX("wrong size cksum on R-card");
724	724	if( !validate16(p->zRepoCksum, 32) ) SYNTAX("malformed R-card cksum");
725	725	break;
726	726	}
727	727

	--- src/manifest.c
	+++ src/manifest.c
	@@ -716,11 +716,11 @@
716	**
717	** Specify the MD5 checksum over the name and content of all files
718	** in the manifest.
719	*/
720	case 'R': {
721	if( p->zRepoCksum!=0 ) SYNTAX("more than on R-card");
722	p->zRepoCksum = next_token(&x, &sz);
723	if( sz!=32 ) SYNTAX("wrong size cksum on R-card");
724	if( !validate16(p->zRepoCksum, 32) ) SYNTAX("malformed R-card cksum");
725	break;
726	}
727

	--- src/manifest.c
	+++ src/manifest.c
	@@ -716,11 +716,11 @@
716	**
717	** Specify the MD5 checksum over the name and content of all files
718	** in the manifest.
719	*/
720	case 'R': {
721	if( p->zRepoCksum!=0 ) SYNTAX("more than one R-card");
722	p->zRepoCksum = next_token(&x, &sz);
723	if( sz!=32 ) SYNTAX("wrong size cksum on R-card");
724	if( !validate16(p->zRepoCksum, 32) ) SYNTAX("malformed R-card cksum");
725	break;
726	}
727

M src/style.c

+3 -3

		--- src/style.c
		+++ src/style.c
		@@ -69,11 +69,11 @@
69	69	** If g.javascriptHyperlink is true then the
70	70	** id="ID" form is used and javascript is generated in the footer to cause
71	71	** href values to be inserted after the page has loaded. If
72	72	** g.perm.History is false, then the <a id="ID"> form is still
73	73	** generated but the javascript is not generated so the links never
74		-** activate.
	74	+** activate.
75	75	**
76	76	** If the user lacks the Hyperlink (h) property and the "auto-hyperlink"
77	77	** setting is true, then g.perm.Hyperlink is changed from 0 to 1 and
78	78	** g.javascriptHyperlink is set to 1. The g.javascriptHyperlink defaults
79	79	** to 0 and only changes to one if the user lacks the Hyperlink (h) property
		@@ -1053,11 +1053,11 @@
1053	1053	},
1054	1054	{ ".statistics-report-graph-line",
1055	1055	"for the /stats_report views",
1056	1056	@ background-color: #446979;
1057	1057	},
1058		- { ".statistics-report-table-events th"
	1058	+ { ".statistics-report-table-events th",
1059	1059	"",
1060	1060	@ padding: 0 1em 0 1em;
1061	1061	},
1062	1062	{ ".statistics-report-table-events td",
1063	1063	"",
		@@ -1200,13 +1200,13 @@
1200	1200	}
1201	1201	style_footer();
1202	1202	}
1203	1203
1204	1204	/*
1205		-** This page is a honeypot for spiders and bots.
	1205	+** This page is a honeypot for spiders and bots.
1206	1206	**
1207	1207	** WEBPAGE: honeypot
1208	1208	*/
1209	1209	void honeypot_page(void){
1210	1210	cgi_set_status(403, "Forbidden");
1211	1211	@ <p>Access by spiders and robots is forbidden</p>
1212	1212	}
1213	1213

	--- src/style.c
	+++ src/style.c
	@@ -69,11 +69,11 @@
69	** If g.javascriptHyperlink is true then the
70	** id="ID" form is used and javascript is generated in the footer to cause
71	** href values to be inserted after the page has loaded. If
72	** g.perm.History is false, then the <a id="ID"> form is still
73	** generated but the javascript is not generated so the links never
74	** activate.
75	**
76	** If the user lacks the Hyperlink (h) property and the "auto-hyperlink"
77	** setting is true, then g.perm.Hyperlink is changed from 0 to 1 and
78	** g.javascriptHyperlink is set to 1. The g.javascriptHyperlink defaults
79	** to 0 and only changes to one if the user lacks the Hyperlink (h) property
	@@ -1053,11 +1053,11 @@
1053	},
1054	{ ".statistics-report-graph-line",
1055	"for the /stats_report views",
1056	@ background-color: #446979;
1057	},
1058	{ ".statistics-report-table-events th"
1059	"",
1060	@ padding: 0 1em 0 1em;
1061	},
1062	{ ".statistics-report-table-events td",
1063	"",
	@@ -1200,13 +1200,13 @@
1200	}
1201	style_footer();
1202	}
1203
1204	/*
1205	** This page is a honeypot for spiders and bots.
1206	**
1207	** WEBPAGE: honeypot
1208	*/
1209	void honeypot_page(void){
1210	cgi_set_status(403, "Forbidden");
1211	@ <p>Access by spiders and robots is forbidden</p>
1212	}
1213

	--- src/style.c
	+++ src/style.c
	@@ -69,11 +69,11 @@
69	** If g.javascriptHyperlink is true then the
70	** id="ID" form is used and javascript is generated in the footer to cause
71	** href values to be inserted after the page has loaded. If
72	** g.perm.History is false, then the <a id="ID"> form is still
73	** generated but the javascript is not generated so the links never
74	** activate.
75	**
76	** If the user lacks the Hyperlink (h) property and the "auto-hyperlink"
77	** setting is true, then g.perm.Hyperlink is changed from 0 to 1 and
78	** g.javascriptHyperlink is set to 1. The g.javascriptHyperlink defaults
79	** to 0 and only changes to one if the user lacks the Hyperlink (h) property
	@@ -1053,11 +1053,11 @@
1053	},
1054	{ ".statistics-report-graph-line",
1055	"for the /stats_report views",
1056	@ background-color: #446979;
1057	},
1058	{ ".statistics-report-table-events th",
1059	"",
1060	@ padding: 0 1em 0 1em;
1061	},
1062	{ ".statistics-report-table-events td",
1063	"",
	@@ -1200,13 +1200,13 @@
1200	}
1201	style_footer();
1202	}
1203
1204	/*
1205	** This page is a honeypot for spiders and bots.
1206	**
1207	** WEBPAGE: honeypot
1208	*/
1209	void honeypot_page(void){
1210	cgi_set_status(403, "Forbidden");
1211	@ <p>Access by spiders and robots is forbidden</p>
1212	}
1213

M src/th.c

+1 -1

		--- src/th.c
		+++ src/th.c
		@@ -1775,11 +1775,11 @@
1775	1775	{">", OP_GT, 5, ARG_NUMBER},
1776	1776	{"&", OP_BITWISE_AND, 8, ARG_INTEGER},
1777	1777	{"^", OP_BITWISE_XOR, 9, ARG_INTEGER},
1778	1778	{"\|", OP_BITWISE_OR, 10, ARG_INTEGER},
1779	1779
1780		- {0,0,0}
	1780	+ {0,0,0,0}
1781	1781	};
1782	1782
1783	1783	/*
1784	1784	** The first part of the string (zInput,nInput) contains a number.
1785	1785	** Set *pnVarname to the number of bytes in the numeric string.
1786	1786

	--- src/th.c
	+++ src/th.c
	@@ -1775,11 +1775,11 @@
1775	{">", OP_GT, 5, ARG_NUMBER},
1776	{"&", OP_BITWISE_AND, 8, ARG_INTEGER},
1777	{"^", OP_BITWISE_XOR, 9, ARG_INTEGER},
1778	{"\|", OP_BITWISE_OR, 10, ARG_INTEGER},
1779
1780	{0,0,0}
1781	};
1782
1783	/*
1784	** The first part of the string (zInput,nInput) contains a number.
1785	** Set *pnVarname to the number of bytes in the numeric string.
1786

	--- src/th.c
	+++ src/th.c
	@@ -1775,11 +1775,11 @@
1775	{">", OP_GT, 5, ARG_NUMBER},
1776	{"&", OP_BITWISE_AND, 8, ARG_INTEGER},
1777	{"^", OP_BITWISE_XOR, 9, ARG_INTEGER},
1778	{"\|", OP_BITWISE_OR, 10, ARG_INTEGER},
1779
1780	{0,0,0,0}
1781	};
1782
1783	/*
1784	** The first part of the string (zInput,nInput) contains a number.
1785	** Set *pnVarname to the number of bytes in the numeric string.
1786

M src/unicode.c

+1 -1

		--- src/unicode.c
		+++ src/unicode.c
		@@ -38,11 +38,11 @@
38	38	** the size of the range (always at least 1). In other words, the value
39	39	** ((C<<22) + N) represents a range of N codepoints starting with codepoint
40	40	** C. It is not possible to represent a range larger than 1023 codepoints
41	41	** using this format.
42	42	*/
43		- const static unsigned int aEntry[] = {
	43	+ static const unsigned int aEntry[] = {
44	44	0x00000030, 0x0000E807, 0x00016C06, 0x0001EC2F, 0x0002AC07,
45	45	0x0002D001, 0x0002D803, 0x0002EC01, 0x0002FC01, 0x00035C01,
46	46	0x0003DC01, 0x000B0804, 0x000B480E, 0x000B9407, 0x000BB401,
47	47	0x000BBC81, 0x000DD401, 0x000DF801, 0x000E1002, 0x000E1C01,
48	48	0x000FD801, 0x00120808, 0x00156806, 0x00162402, 0x00163C01,
49	49

	--- src/unicode.c
	+++ src/unicode.c
	@@ -38,11 +38,11 @@
38	** the size of the range (always at least 1). In other words, the value
39	** ((C<<22) + N) represents a range of N codepoints starting with codepoint
40	** C. It is not possible to represent a range larger than 1023 codepoints
41	** using this format.
42	*/
43	const static unsigned int aEntry[] = {
44	0x00000030, 0x0000E807, 0x00016C06, 0x0001EC2F, 0x0002AC07,
45	0x0002D001, 0x0002D803, 0x0002EC01, 0x0002FC01, 0x00035C01,
46	0x0003DC01, 0x000B0804, 0x000B480E, 0x000B9407, 0x000BB401,
47	0x000BBC81, 0x000DD401, 0x000DF801, 0x000E1002, 0x000E1C01,
48	0x000FD801, 0x00120808, 0x00156806, 0x00162402, 0x00163C01,
49

	--- src/unicode.c
	+++ src/unicode.c
	@@ -38,11 +38,11 @@
38	** the size of the range (always at least 1). In other words, the value
39	** ((C<<22) + N) represents a range of N codepoints starting with codepoint
40	** C. It is not possible to represent a range larger than 1023 codepoints
41	** using this format.
42	*/
43	static const unsigned int aEntry[] = {
44	0x00000030, 0x0000E807, 0x00016C06, 0x0001EC2F, 0x0002AC07,
45	0x0002D001, 0x0002D803, 0x0002EC01, 0x0002FC01, 0x00035C01,
46	0x0003DC01, 0x000B0804, 0x000B480E, 0x000B9407, 0x000BB401,
47	0x000BBC81, 0x000DD401, 0x000DF801, 0x000E1002, 0x000E1C01,
48	0x000FD801, 0x00120808, 0x00156806, 0x00162402, 0x00163C01,
49

Fossil SCM

Keyboard Shortcuts