Fossil SCM

Fixed a couple C99-isms reported at [https://fossil-scm.org/forum/forumpost/487f05e382 | /forumpost/487f05e382].

stephan 2021-01-14 11:15 trunk

Commit a7af387dd8aa7f5bfea84a15fa33487ceab8d94047e8eb54e1c473f6003d6402

Parent c21f739753abb5b…

2 files changed +4 -2 +2 -2

M src/import.c

+4 -2

		--- src/import.c
		+++ src/import.c
		@@ -1797,10 +1797,11 @@
1797	1797	gsvn.zBranches = find_option("branches", 0, 1);
1798	1798	gsvn.zTags = find_option("tags", 0, 1);
1799	1799	gsvn.revFlag = find_option("rev-tags", 0, 0)
1800	1800	\|\| (incrFlag && !find_option("no-rev-tags", 0, 0));
1801	1801	}else if( gitFlag ){
	1802	+ const char *zGitUser;
1802	1803	markfile_in = find_option("import-marks", 0, 1);
1803	1804	markfile_out = find_option("export-marks", 0, 1);
1804	1805	if( !(ggit.zMasterName = find_option("rename-master", 0, 1)) ){
1805	1806	ggit.zMasterName = "master";
1806	1807	}
		@@ -1807,15 +1808,16 @@
1807	1808	ggit.authorFlag = find_option("use-author", 0, 0)!=0;
1808	1809	/*
1809	1810	** Extract --attribute 'emailaddr username' args that will populate
1810	1811	** new 'fx_' table to later match username for check-in attribution.
1811	1812	*/
1812		- const char *zGitUser = find_option("attribute", 0, 1);
	1813	+ zGitUser = find_option("attribute", 0, 1);
1813	1814	while( zGitUser != 0 ){
	1815	+ char *currGitUser;
1814	1816	ggit.gitUserInfo = fossil_realloc(ggit.gitUserInfo, ++ggit.nGitAttr
1815	1817	* sizeof(ggit.gitUserInfo[0]));
1816		- char *currGitUser = fossil_strdup(zGitUser);
	1818	+ currGitUser = fossil_strdup(zGitUser);
1817	1819	ggit.gitUserInfo[ggit.nGitAttr-1].zEmail = next_token(&currGitUser);
1818	1820	ggit.gitUserInfo[ggit.nGitAttr-1].zUser = rest_of_line(&currGitUser);
1819	1821	zGitUser = find_option("attribute", 0, 1);
1820	1822	}
1821	1823	}
1822	1824

	--- src/import.c
	+++ src/import.c
	@@ -1797,10 +1797,11 @@
1797	gsvn.zBranches = find_option("branches", 0, 1);
1798	gsvn.zTags = find_option("tags", 0, 1);
1799	gsvn.revFlag = find_option("rev-tags", 0, 0)
1800	\|\| (incrFlag && !find_option("no-rev-tags", 0, 0));
1801	}else if( gitFlag ){

1802	markfile_in = find_option("import-marks", 0, 1);
1803	markfile_out = find_option("export-marks", 0, 1);
1804	if( !(ggit.zMasterName = find_option("rename-master", 0, 1)) ){
1805	ggit.zMasterName = "master";
1806	}
	@@ -1807,15 +1808,16 @@
1807	ggit.authorFlag = find_option("use-author", 0, 0)!=0;
1808	/*
1809	** Extract --attribute 'emailaddr username' args that will populate
1810	** new 'fx_' table to later match username for check-in attribution.
1811	*/
1812	const char *zGitUser = find_option("attribute", 0, 1);
1813	while( zGitUser != 0 ){

1814	ggit.gitUserInfo = fossil_realloc(ggit.gitUserInfo, ++ggit.nGitAttr
1815	* sizeof(ggit.gitUserInfo[0]));
1816	char *currGitUser = fossil_strdup(zGitUser);
1817	ggit.gitUserInfo[ggit.nGitAttr-1].zEmail = next_token(&currGitUser);
1818	ggit.gitUserInfo[ggit.nGitAttr-1].zUser = rest_of_line(&currGitUser);
1819	zGitUser = find_option("attribute", 0, 1);
1820	}
1821	}
1822

	--- src/import.c
	+++ src/import.c
	@@ -1797,10 +1797,11 @@
1797	gsvn.zBranches = find_option("branches", 0, 1);
1798	gsvn.zTags = find_option("tags", 0, 1);
1799	gsvn.revFlag = find_option("rev-tags", 0, 0)
1800	\|\| (incrFlag && !find_option("no-rev-tags", 0, 0));
1801	}else if( gitFlag ){
1802	const char *zGitUser;
1803	markfile_in = find_option("import-marks", 0, 1);
1804	markfile_out = find_option("export-marks", 0, 1);
1805	if( !(ggit.zMasterName = find_option("rename-master", 0, 1)) ){
1806	ggit.zMasterName = "master";
1807	}
	@@ -1807,15 +1808,16 @@
1808	ggit.authorFlag = find_option("use-author", 0, 0)!=0;
1809	/*
1810	** Extract --attribute 'emailaddr username' args that will populate
1811	** new 'fx_' table to later match username for check-in attribution.
1812	*/
1813	zGitUser = find_option("attribute", 0, 1);
1814	while( zGitUser != 0 ){
1815	char *currGitUser;
1816	ggit.gitUserInfo = fossil_realloc(ggit.gitUserInfo, ++ggit.nGitAttr
1817	* sizeof(ggit.gitUserInfo[0]));
1818	currGitUser = fossil_strdup(zGitUser);
1819	ggit.gitUserInfo[ggit.nGitAttr-1].zEmail = next_token(&currGitUser);
1820	ggit.gitUserInfo[ggit.nGitAttr-1].zUser = rest_of_line(&currGitUser);
1821	zGitUser = find_option("attribute", 0, 1);
1822	}
1823	}
1824

M src/timeline.c

+2 -2

		--- src/timeline.c
		+++ src/timeline.c
		@@ -2982,15 +2982,15 @@
2982	2982	}else{
2983	2983	zFree = mprintf("[%S] %s%s", zId, zPrefix, zCom);
2984	2984	}
2985	2985
2986	2986	if( zFormat ){
	2987	+ char *zEntry;
	2988	+ int nEntryLine = 0;
2987	2989	if( nChild==0 ){
2988	2990	sqlite3_snprintf(sizeof(zPrefix)-n, &zPrefix[n], "LEAF ");
2989	2991	}
2990		- char *zEntry;
2991		- int nEntryLine = 0;
2992	2992	zEntry = timeline_entry_subst(zFormat, &nEntryLine, zId, zDate, zUserShort,
2993	2993	zComShort, zBranch, zTags, zPrefix);
2994	2994	nLine += nEntryLine;
2995	2995	fossil_print("%s\n", zEntry);
2996	2996	fossil_free(zEntry);
2997	2997

	--- src/timeline.c
	+++ src/timeline.c
	@@ -2982,15 +2982,15 @@
2982	}else{
2983	zFree = mprintf("[%S] %s%s", zId, zPrefix, zCom);
2984	}
2985
2986	if( zFormat ){


2987	if( nChild==0 ){
2988	sqlite3_snprintf(sizeof(zPrefix)-n, &zPrefix[n], "LEAF ");
2989	}
2990	char *zEntry;
2991	int nEntryLine = 0;
2992	zEntry = timeline_entry_subst(zFormat, &nEntryLine, zId, zDate, zUserShort,
2993	zComShort, zBranch, zTags, zPrefix);
2994	nLine += nEntryLine;
2995	fossil_print("%s\n", zEntry);
2996	fossil_free(zEntry);
2997

	--- src/timeline.c
	+++ src/timeline.c
	@@ -2982,15 +2982,15 @@
2982	}else{
2983	zFree = mprintf("[%S] %s%s", zId, zPrefix, zCom);
2984	}
2985
2986	if( zFormat ){
2987	char *zEntry;
2988	int nEntryLine = 0;
2989	if( nChild==0 ){
2990	sqlite3_snprintf(sizeof(zPrefix)-n, &zPrefix[n], "LEAF ");
2991	}


2992	zEntry = timeline_entry_subst(zFormat, &nEntryLine, zId, zDate, zUserShort,
2993	zComShort, zBranch, zTags, zPrefix);
2994	nLine += nEntryLine;
2995	fossil_print("%s\n", zEntry);
2996	fossil_free(zEntry);
2997