Fossil SCM

Unnecessary blob_zero() calls: the following prompt_user() call already does a blob_zero() call internally.

jan.nijtmans 2014-02-20 09:42 trunk

Commit 14768c24e5080377fdc7a7a0b8bc0ebd438eb7df

Parent 6ec21b58a2c28e9…

5 files changed -1 -1 -9 -1 -1

~ src/add.c ~ src/branch.c ~ src/checkin.c ~ src/rebuild.c ~ src/stash.c

M src/add.c

-1

		--- src/add.c
		+++ src/add.c
		@@ -299,11 +299,10 @@
299	299	if( !forceFlag && glob_match(pIgnore, zTreeName) ){
300	300	Blob ans;
301	301	char cReply;
302	302	char *prompt = mprintf("file \"%s\" matches \"ignore-glob\". "
303	303	"Add it (a=all/y/N)? ", zTreeName);
304		- blob_zero(&ans);
305	304	prompt_user(prompt, &ans);
306	305	cReply = blob_str(&ans)[0];
307	306	blob_reset(&ans);
308	307	if( cReply=='a' \|\| cReply=='A' ){
309	308	forceFlag = 1;
310	309

	--- src/add.c
	+++ src/add.c
	@@ -299,11 +299,10 @@
299	if( !forceFlag && glob_match(pIgnore, zTreeName) ){
300	Blob ans;
301	char cReply;
302	char *prompt = mprintf("file \"%s\" matches \"ignore-glob\". "
303	"Add it (a=all/y/N)? ", zTreeName);
304	blob_zero(&ans);
305	prompt_user(prompt, &ans);
306	cReply = blob_str(&ans)[0];
307	blob_reset(&ans);
308	if( cReply=='a' \|\| cReply=='A' ){
309	forceFlag = 1;
310

	--- src/add.c
	+++ src/add.c
	@@ -299,11 +299,10 @@
299	if( !forceFlag && glob_match(pIgnore, zTreeName) ){
300	Blob ans;
301	char cReply;
302	char *prompt = mprintf("file \"%s\" matches \"ignore-glob\". "
303	"Add it (a=all/y/N)? ", zTreeName);

304	prompt_user(prompt, &ans);
305	cReply = blob_str(&ans)[0];
306	blob_reset(&ans);
307	if( cReply=='a' \|\| cReply=='A' ){
308	forceFlag = 1;
309

M src/branch.c

-1

		--- src/branch.c
		+++ src/branch.c
		@@ -140,11 +140,10 @@
140	140	md5sum_blob(&branch, &mcksum);
141	141	blob_appendf(&branch, "Z %b\n", &mcksum);
142	142	if( !noSign && clearsign(&branch, &branch) ){
143	143	Blob ans;
144	144	char cReply;
145		- blob_zero(&ans);
146	145	prompt_user("unable to sign manifest. continue (y/N)? ", &ans);
147	146	cReply = blob_str(&ans)[0];
148	147	if( cReply!='y' && cReply!='Y'){
149	148	db_end_transaction(1);
150	149	fossil_exit(1);
151	150

	--- src/branch.c
	+++ src/branch.c
	@@ -140,11 +140,10 @@
140	md5sum_blob(&branch, &mcksum);
141	blob_appendf(&branch, "Z %b\n", &mcksum);
142	if( !noSign && clearsign(&branch, &branch) ){
143	Blob ans;
144	char cReply;
145	blob_zero(&ans);
146	prompt_user("unable to sign manifest. continue (y/N)? ", &ans);
147	cReply = blob_str(&ans)[0];
148	if( cReply!='y' && cReply!='Y'){
149	db_end_transaction(1);
150	fossil_exit(1);
151

	--- src/branch.c
	+++ src/branch.c
	@@ -140,11 +140,10 @@
140	md5sum_blob(&branch, &mcksum);
141	blob_appendf(&branch, "Z %b\n", &mcksum);
142	if( !noSign && clearsign(&branch, &branch) ){
143	Blob ans;
144	char cReply;

145	prompt_user("unable to sign manifest. continue (y/N)? ", &ans);
146	cReply = blob_str(&ans)[0];
147	if( cReply!='y' && cReply!='Y'){
148	db_end_transaction(1);
149	fossil_exit(1);
150

M src/checkin.c

-9

		--- src/checkin.c
		+++ src/checkin.c
		@@ -600,11 +600,10 @@
600	600	if( !allFileFlag && !dryRunFlag && !glob_match(pClean, zName+nRoot) ){
601	601	Blob ans;
602	602	char cReply;
603	603	char *prompt = mprintf("Remove unmanaged file \"%s\" (a=all/y/N)? ",
604	604	zName+nRoot);
605		- blob_zero(&ans);
606	605	prompt_user(prompt, &ans);
607	606	cReply = blob_str(&ans)[0];
608	607	if( cReply=='a' \|\| cReply=='A' ){
609	608	allFileFlag = 1;
610	609	}else if( cReply!='y' && cReply!='Y' ){
		@@ -642,11 +641,10 @@
642	641	if( !allDirFlag && !dryRunFlag && !glob_match(pClean, zName+nRoot) ){
643	642	Blob ans;
644	643	char cReply;
645	644	char *prompt = mprintf("Remove empty directory \"%s\" (a=all/y/N)? ",
646	645	zName+nRoot);
647		- blob_zero(&ans);
648	646	prompt_user(prompt, &ans);
649	647	cReply = blob_str(&ans)[0];
650	648	if( cReply=='a' \|\| cReply=='A' ){
651	649	allDirFlag = 1;
652	650	}else if( cReply!='y' && cReply!='Y' ){
		@@ -1288,11 +1286,10 @@
1288	1286	}
1289	1287	zWarning = "Unicode";
1290	1288	zDisable = "\"encoding-glob\" setting";
1291	1289	}
1292	1290	file_relative_name(zFilename, &fname, 0);
1293		- blob_zero(&ans);
1294	1291	zMsg = mprintf(
1295	1292	"%s contains %s. Use --no-warnings or the %s to disable this warning.\n"
1296	1293	"Commit anyhow (a=all/%sy/N)? ",
1297	1294	blob_str(&fname), zWarning, zDisable, zConvert);
1298	1295	prompt_user(zMsg, &ans);
		@@ -1531,11 +1528,10 @@
1531	1528	/*
1532	1529	** Autosync if autosync is enabled and this is not a private check-in.
1533	1530	*/
1534	1531	if( !g.markPrivate ){
1535	1532	if( autosync(SYNC_PULL) ){
1536		- blob_zero(&ans);
1537	1533	prompt_user("continue in spite of sync failure (y/N)? ", &ans);
1538	1534	cReply = blob_str(&ans)[0];
1539	1535	if( cReply!='y' && cReply!='Y' ){
1540	1536	fossil_exit(1);
1541	1537	}
		@@ -1544,11 +1540,10 @@
1544	1540
1545	1541	/* Require confirmation to continue with the check-in if there is
1546	1542	** clock skew
1547	1543	*/
1548	1544	if( g.clockSkewSeen ){
1549		- blob_zero(&ans);
1550	1545	prompt_user("continue in spite of time skew (y/N)? ", &ans);
1551	1546	cReply = blob_str(&ans)[0];
1552	1547	if( cReply!='y' && cReply!='Y' ){
1553	1548	fossil_exit(1);
1554	1549	}
		@@ -1563,11 +1558,10 @@
1563	1558	** array is allocated to contain the "id" field from the vfile table
1564	1559	** for each file to be committed. Or, if aCommitFile is NULL, all files
1565	1560	** should be committed.
1566	1561	*/
1567	1562	if( select_commit_files() ){
1568		- blob_zero(&ans);
1569	1563	prompt_user("continue (y/N)? ", &ans);
1570	1564	cReply = blob_str(&ans)[0];
1571	1565	if( cReply!='y' && cReply!='Y' ) fossil_exit(1);;
1572	1566	}
1573	1567	isAMerge = db_exists("SELECT 1 FROM vmerge WHERE id=0 OR id<-2");
		@@ -1664,20 +1658,18 @@
1664	1658	blob_zero(&comment);
1665	1659	}else{
1666	1660	char *zInit = db_text(0, "SELECT value FROM vvar WHERE name='ci-comment'");
1667	1661	prepare_commit_comment(&comment, zInit, &sCiInfo, vid);
1668	1662	if( zInit && zInit[0] && fossil_strcmp(zInit, blob_str(&comment))==0 ){
1669		- blob_zero(&ans);
1670	1663	prompt_user("unchanged check-in comment. continue (y/N)? ", &ans);
1671	1664	cReply = blob_str(&ans)[0];
1672	1665	if( cReply!='y' && cReply!='Y' ) fossil_exit(1);;
1673	1666	}
1674	1667	free(zInit);
1675	1668	}
1676	1669	if( blob_size(&comment)==0 ){
1677	1670	if( !dryRunFlag ){
1678		- blob_zero(&ans);
1679	1671	prompt_user("empty check-in comment. continue (y/N)? ", &ans);
1680	1672	cReply = blob_str(&ans)[0];
1681	1673	if( cReply!='y' && cReply!='Y' ){
1682	1674	fossil_exit(1);
1683	1675	}
		@@ -1806,11 +1798,10 @@
1806	1798	}else if( forceDelta ){
1807	1799	fossil_fatal("unable to find a baseline-manifest for the delta");
1808	1800	}
1809	1801	}
1810	1802	if( !noSign && !g.markPrivate && clearsign(&manifest, &manifest) ){
1811		- blob_zero(&ans);
1812	1803	prompt_user("unable to sign manifest. continue (y/N)? ", &ans);
1813	1804	cReply = blob_str(&ans)[0];
1814	1805	if( cReply!='y' && cReply!='Y' ){
1815	1806	fossil_exit(1);
1816	1807	}
1817	1808

	--- src/checkin.c
	+++ src/checkin.c
	@@ -600,11 +600,10 @@
600	if( !allFileFlag && !dryRunFlag && !glob_match(pClean, zName+nRoot) ){
601	Blob ans;
602	char cReply;
603	char *prompt = mprintf("Remove unmanaged file \"%s\" (a=all/y/N)? ",
604	zName+nRoot);
605	blob_zero(&ans);
606	prompt_user(prompt, &ans);
607	cReply = blob_str(&ans)[0];
608	if( cReply=='a' \|\| cReply=='A' ){
609	allFileFlag = 1;
610	}else if( cReply!='y' && cReply!='Y' ){
	@@ -642,11 +641,10 @@
642	if( !allDirFlag && !dryRunFlag && !glob_match(pClean, zName+nRoot) ){
643	Blob ans;
644	char cReply;
645	char *prompt = mprintf("Remove empty directory \"%s\" (a=all/y/N)? ",
646	zName+nRoot);
647	blob_zero(&ans);
648	prompt_user(prompt, &ans);
649	cReply = blob_str(&ans)[0];
650	if( cReply=='a' \|\| cReply=='A' ){
651	allDirFlag = 1;
652	}else if( cReply!='y' && cReply!='Y' ){
	@@ -1288,11 +1286,10 @@
1288	}
1289	zWarning = "Unicode";
1290	zDisable = "\"encoding-glob\" setting";
1291	}
1292	file_relative_name(zFilename, &fname, 0);
1293	blob_zero(&ans);
1294	zMsg = mprintf(
1295	"%s contains %s. Use --no-warnings or the %s to disable this warning.\n"
1296	"Commit anyhow (a=all/%sy/N)? ",
1297	blob_str(&fname), zWarning, zDisable, zConvert);
1298	prompt_user(zMsg, &ans);
	@@ -1531,11 +1528,10 @@
1531	/*
1532	** Autosync if autosync is enabled and this is not a private check-in.
1533	*/
1534	if( !g.markPrivate ){
1535	if( autosync(SYNC_PULL) ){
1536	blob_zero(&ans);
1537	prompt_user("continue in spite of sync failure (y/N)? ", &ans);
1538	cReply = blob_str(&ans)[0];
1539	if( cReply!='y' && cReply!='Y' ){
1540	fossil_exit(1);
1541	}
	@@ -1544,11 +1540,10 @@
1544
1545	/* Require confirmation to continue with the check-in if there is
1546	** clock skew
1547	*/
1548	if( g.clockSkewSeen ){
1549	blob_zero(&ans);
1550	prompt_user("continue in spite of time skew (y/N)? ", &ans);
1551	cReply = blob_str(&ans)[0];
1552	if( cReply!='y' && cReply!='Y' ){
1553	fossil_exit(1);
1554	}
	@@ -1563,11 +1558,10 @@
1563	** array is allocated to contain the "id" field from the vfile table
1564	** for each file to be committed. Or, if aCommitFile is NULL, all files
1565	** should be committed.
1566	*/
1567	if( select_commit_files() ){
1568	blob_zero(&ans);
1569	prompt_user("continue (y/N)? ", &ans);
1570	cReply = blob_str(&ans)[0];
1571	if( cReply!='y' && cReply!='Y' ) fossil_exit(1);;
1572	}
1573	isAMerge = db_exists("SELECT 1 FROM vmerge WHERE id=0 OR id<-2");
	@@ -1664,20 +1658,18 @@
1664	blob_zero(&comment);
1665	}else{
1666	char *zInit = db_text(0, "SELECT value FROM vvar WHERE name='ci-comment'");
1667	prepare_commit_comment(&comment, zInit, &sCiInfo, vid);
1668	if( zInit && zInit[0] && fossil_strcmp(zInit, blob_str(&comment))==0 ){
1669	blob_zero(&ans);
1670	prompt_user("unchanged check-in comment. continue (y/N)? ", &ans);
1671	cReply = blob_str(&ans)[0];
1672	if( cReply!='y' && cReply!='Y' ) fossil_exit(1);;
1673	}
1674	free(zInit);
1675	}
1676	if( blob_size(&comment)==0 ){
1677	if( !dryRunFlag ){
1678	blob_zero(&ans);
1679	prompt_user("empty check-in comment. continue (y/N)? ", &ans);
1680	cReply = blob_str(&ans)[0];
1681	if( cReply!='y' && cReply!='Y' ){
1682	fossil_exit(1);
1683	}
	@@ -1806,11 +1798,10 @@
1806	}else if( forceDelta ){
1807	fossil_fatal("unable to find a baseline-manifest for the delta");
1808	}
1809	}
1810	if( !noSign && !g.markPrivate && clearsign(&manifest, &manifest) ){
1811	blob_zero(&ans);
1812	prompt_user("unable to sign manifest. continue (y/N)? ", &ans);
1813	cReply = blob_str(&ans)[0];
1814	if( cReply!='y' && cReply!='Y' ){
1815	fossil_exit(1);
1816	}
1817

	--- src/checkin.c
	+++ src/checkin.c
	@@ -600,11 +600,10 @@
600	if( !allFileFlag && !dryRunFlag && !glob_match(pClean, zName+nRoot) ){
601	Blob ans;
602	char cReply;
603	char *prompt = mprintf("Remove unmanaged file \"%s\" (a=all/y/N)? ",
604	zName+nRoot);

605	prompt_user(prompt, &ans);
606	cReply = blob_str(&ans)[0];
607	if( cReply=='a' \|\| cReply=='A' ){
608	allFileFlag = 1;
609	}else if( cReply!='y' && cReply!='Y' ){
	@@ -642,11 +641,10 @@
641	if( !allDirFlag && !dryRunFlag && !glob_match(pClean, zName+nRoot) ){
642	Blob ans;
643	char cReply;
644	char *prompt = mprintf("Remove empty directory \"%s\" (a=all/y/N)? ",
645	zName+nRoot);

646	prompt_user(prompt, &ans);
647	cReply = blob_str(&ans)[0];
648	if( cReply=='a' \|\| cReply=='A' ){
649	allDirFlag = 1;
650	}else if( cReply!='y' && cReply!='Y' ){
	@@ -1288,11 +1286,10 @@
1286	}
1287	zWarning = "Unicode";
1288	zDisable = "\"encoding-glob\" setting";
1289	}
1290	file_relative_name(zFilename, &fname, 0);

1291	zMsg = mprintf(
1292	"%s contains %s. Use --no-warnings or the %s to disable this warning.\n"
1293	"Commit anyhow (a=all/%sy/N)? ",
1294	blob_str(&fname), zWarning, zDisable, zConvert);
1295	prompt_user(zMsg, &ans);
	@@ -1531,11 +1528,10 @@
1528	/*
1529	** Autosync if autosync is enabled and this is not a private check-in.
1530	*/
1531	if( !g.markPrivate ){
1532	if( autosync(SYNC_PULL) ){

1533	prompt_user("continue in spite of sync failure (y/N)? ", &ans);
1534	cReply = blob_str(&ans)[0];
1535	if( cReply!='y' && cReply!='Y' ){
1536	fossil_exit(1);
1537	}
	@@ -1544,11 +1540,10 @@
1540
1541	/* Require confirmation to continue with the check-in if there is
1542	** clock skew
1543	*/
1544	if( g.clockSkewSeen ){

1545	prompt_user("continue in spite of time skew (y/N)? ", &ans);
1546	cReply = blob_str(&ans)[0];
1547	if( cReply!='y' && cReply!='Y' ){
1548	fossil_exit(1);
1549	}
	@@ -1563,11 +1558,10 @@
1558	** array is allocated to contain the "id" field from the vfile table
1559	** for each file to be committed. Or, if aCommitFile is NULL, all files
1560	** should be committed.
1561	*/
1562	if( select_commit_files() ){

1563	prompt_user("continue (y/N)? ", &ans);
1564	cReply = blob_str(&ans)[0];
1565	if( cReply!='y' && cReply!='Y' ) fossil_exit(1);;
1566	}
1567	isAMerge = db_exists("SELECT 1 FROM vmerge WHERE id=0 OR id<-2");
	@@ -1664,20 +1658,18 @@
1658	blob_zero(&comment);
1659	}else{
1660	char *zInit = db_text(0, "SELECT value FROM vvar WHERE name='ci-comment'");
1661	prepare_commit_comment(&comment, zInit, &sCiInfo, vid);
1662	if( zInit && zInit[0] && fossil_strcmp(zInit, blob_str(&comment))==0 ){

1663	prompt_user("unchanged check-in comment. continue (y/N)? ", &ans);
1664	cReply = blob_str(&ans)[0];
1665	if( cReply!='y' && cReply!='Y' ) fossil_exit(1);;
1666	}
1667	free(zInit);
1668	}
1669	if( blob_size(&comment)==0 ){
1670	if( !dryRunFlag ){

1671	prompt_user("empty check-in comment. continue (y/N)? ", &ans);
1672	cReply = blob_str(&ans)[0];
1673	if( cReply!='y' && cReply!='Y' ){
1674	fossil_exit(1);
1675	}
	@@ -1806,11 +1798,10 @@
1798	}else if( forceDelta ){
1799	fossil_fatal("unable to find a baseline-manifest for the delta");
1800	}
1801	}
1802	if( !noSign && !g.markPrivate && clearsign(&manifest, &manifest) ){

1803	prompt_user("unable to sign manifest. continue (y/N)? ", &ans);
1804	cReply = blob_str(&ans)[0];
1805	if( cReply!='y' && cReply!='Y' ){
1806	fossil_exit(1);
1807	}
1808

M src/rebuild.c

-1

		--- src/rebuild.c
		+++ src/rebuild.c
		@@ -793,11 +793,10 @@
793	793	db_close(1);
794	794	db_open_repository(g.zRepositoryName);
795	795	if( !bForce ){
796	796	Blob ans;
797	797	char cReply;
798		- blob_zero(&ans);
799	798	prompt_user(
800	799	"Scrubbing the repository will permanently delete information.\n"
801	800	"Changes cannot be undone. Continue (y/N)? ", &ans);
802	801	cReply = blob_str(&ans)[0];
803	802	if( cReply!='y' && cReply!='Y' ){
804	803

	--- src/rebuild.c
	+++ src/rebuild.c
	@@ -793,11 +793,10 @@
793	db_close(1);
794	db_open_repository(g.zRepositoryName);
795	if( !bForce ){
796	Blob ans;
797	char cReply;
798	blob_zero(&ans);
799	prompt_user(
800	"Scrubbing the repository will permanently delete information.\n"
801	"Changes cannot be undone. Continue (y/N)? ", &ans);
802	cReply = blob_str(&ans)[0];
803	if( cReply!='y' && cReply!='Y' ){
804

	--- src/rebuild.c
	+++ src/rebuild.c
	@@ -793,11 +793,10 @@
793	db_close(1);
794	db_open_repository(g.zRepositoryName);
795	if( !bForce ){
796	Blob ans;
797	char cReply;

798	prompt_user(
799	"Scrubbing the repository will permanently delete information.\n"
800	"Changes cannot be undone. Continue (y/N)? ", &ans);
801	cReply = blob_str(&ans)[0];
802	if( cReply!='y' && cReply!='Y' ){
803

M src/stash.c

-1

		--- src/stash.c
		+++ src/stash.c
		@@ -568,11 +568,10 @@
568	568	if( memcmp(zCmd, "drop", nCmd)==0 \|\| memcmp(zCmd, "rm", nCmd)==0 ){
569	569	int allFlag = find_option("all", "a", 0)!=0;
570	570	if( allFlag ){
571	571	Blob ans;
572	572	char cReply;
573		- blob_zero(&ans);
574	573	prompt_user("This action is not undoable. Continue (y/N)? ", &ans);
575	574	cReply = blob_str(&ans)[0];
576	575	if( cReply=='y' \|\| cReply=='Y' ){
577	576	db_multi_exec("DELETE FROM stash; DELETE FROM stashfile;");
578	577	}
579	578

	--- src/stash.c
	+++ src/stash.c
	@@ -568,11 +568,10 @@
568	if( memcmp(zCmd, "drop", nCmd)==0 \|\| memcmp(zCmd, "rm", nCmd)==0 ){
569	int allFlag = find_option("all", "a", 0)!=0;
570	if( allFlag ){
571	Blob ans;
572	char cReply;
573	blob_zero(&ans);
574	prompt_user("This action is not undoable. Continue (y/N)? ", &ans);
575	cReply = blob_str(&ans)[0];
576	if( cReply=='y' \|\| cReply=='Y' ){
577	db_multi_exec("DELETE FROM stash; DELETE FROM stashfile;");
578	}
579

	--- src/stash.c
	+++ src/stash.c
	@@ -568,11 +568,10 @@
568	if( memcmp(zCmd, "drop", nCmd)==0 \|\| memcmp(zCmd, "rm", nCmd)==0 ){
569	int allFlag = find_option("all", "a", 0)!=0;
570	if( allFlag ){
571	Blob ans;
572	char cReply;

573	prompt_user("This action is not undoable. Continue (y/N)? ", &ans);
574	cReply = blob_str(&ans)[0];
575	if( cReply=='y' \|\| cReply=='Y' ){
576	db_multi_exec("DELETE FROM stash; DELETE FROM stashfile;");
577	}
578

Fossil SCM

Keyboard Shortcuts