Fossil SCM

Remove unused variables and surplus blank lines from the side-by-side diff code.

drh 2011-10-17 01:18 UTC jan-sbsdiff

Commit a92908a6b53d9120d18c09b835fed1047bded7ad

Parent 8e358aa8c6f2110…

1 file changed -12

M src/diff.c

-12

		--- src/diff.c
		+++ src/diff.c
		@@ -659,13 +659,10 @@
659	659	i=0;
660	660	while( i<c.nEdit ){
661	661	int j;
662	662	/* Copied lines */
663	663	for( j=0; j<c.aEdit[i]; j++){
664		- int len;
665		- int dist;
666		-
667	664	/* Hide lines which are copied and are further away from block boundaries
668	665	** than nConext lines. For each block with hidden lines, show a row
669	666	** notifying the user about the hidden rows.
670	667	*/
671	668	if( j<nContext \|\| j>c.aEdit[i]-nContext-1 ){
		@@ -703,11 +700,10 @@
703	700	int lim;
704	701	lim = c.aEdit[i+1] > c.aEdit[i+2] ? c.aEdit[i+1] : c.aEdit[i+2];
705	702
706	703	/* Assume changed lines */
707	704	for( j=0; j<lim; j++ ){
708		- int len;
709	705	@ <tr>
710	706
711	707	if( j<c.aEdit[i+1] ){
712	708	copylimline(linebuf, &c.aFrom[iFrom+j], collim);
713	709	@ <td class="changed lineno">%d(iFrom+j+1)</td>
		@@ -732,37 +728,29 @@
732	728	iTo+=c.aEdit[i+2];
733	729	}else{
734	730
735	731	/* Process deleted lines */
736	732	for( j=0; j<c.aEdit[i+1]; j++ ){
737		- int len;
738	733	@ <tr>
739	734
740	735	copylimline(linebuf, &c.aFrom[iFrom+j], collim);
741	736	@ <td class="removed lineno">%d(iFrom+j+1)</td>
742	737	@ <td class="removed srcline">%h(linebuf)</td>
743		-
744	738	@ <td><</td>
745		-
746	739	@ <td colspan="2" class="removedvoid"/>
747		-
748	740	@ </tr>
749	741	}
750	742	iFrom+=c.aEdit[i+1];
751	743
752	744	/* Process inserted lines */
753	745	for( j=0; j<c.aEdit[i+2]; j++ ){
754		- int len;
755	746	@ <tr>
756	747	@ <td colspan="2" class="addedvoid"/>
757		-
758	748	@ <td>></td>
759		-
760	749	copylimline(linebuf, &c.aTo[iTo+j], collim);
761	750	@ <td class="added lineno">%d(iTo+j+1)</td>
762	751	@ <td class="added srcline">%h(linebuf)</td>
763		-
764	752	@ </tr>
765	753	}
766	754	iTo+=c.aEdit[i+2];
767	755	}
768	756
769	757

	--- src/diff.c
	+++ src/diff.c
	@@ -659,13 +659,10 @@
659	i=0;
660	while( i<c.nEdit ){
661	int j;
662	/* Copied lines */
663	for( j=0; j<c.aEdit[i]; j++){
664	int len;
665	int dist;
666
667	/* Hide lines which are copied and are further away from block boundaries
668	** than nConext lines. For each block with hidden lines, show a row
669	** notifying the user about the hidden rows.
670	*/
671	if( j<nContext \|\| j>c.aEdit[i]-nContext-1 ){
	@@ -703,11 +700,10 @@
703	int lim;
704	lim = c.aEdit[i+1] > c.aEdit[i+2] ? c.aEdit[i+1] : c.aEdit[i+2];
705
706	/* Assume changed lines */
707	for( j=0; j<lim; j++ ){
708	int len;
709	@ <tr>
710
711	if( j<c.aEdit[i+1] ){
712	copylimline(linebuf, &c.aFrom[iFrom+j], collim);
713	@ <td class="changed lineno">%d(iFrom+j+1)</td>
	@@ -732,37 +728,29 @@
732	iTo+=c.aEdit[i+2];
733	}else{
734
735	/* Process deleted lines */
736	for( j=0; j<c.aEdit[i+1]; j++ ){
737	int len;
738	@ <tr>
739
740	copylimline(linebuf, &c.aFrom[iFrom+j], collim);
741	@ <td class="removed lineno">%d(iFrom+j+1)</td>
742	@ <td class="removed srcline">%h(linebuf)</td>
743
744	@ <td><</td>
745
746	@ <td colspan="2" class="removedvoid"/>
747
748	@ </tr>
749	}
750	iFrom+=c.aEdit[i+1];
751
752	/* Process inserted lines */
753	for( j=0; j<c.aEdit[i+2]; j++ ){
754	int len;
755	@ <tr>
756	@ <td colspan="2" class="addedvoid"/>
757
758	@ <td>></td>
759
760	copylimline(linebuf, &c.aTo[iTo+j], collim);
761	@ <td class="added lineno">%d(iTo+j+1)</td>
762	@ <td class="added srcline">%h(linebuf)</td>
763
764	@ </tr>
765	}
766	iTo+=c.aEdit[i+2];
767	}
768
769

	--- src/diff.c
	+++ src/diff.c
	@@ -659,13 +659,10 @@
659	i=0;
660	while( i<c.nEdit ){
661	int j;
662	/* Copied lines */
663	for( j=0; j<c.aEdit[i]; j++){



664	/* Hide lines which are copied and are further away from block boundaries
665	** than nConext lines. For each block with hidden lines, show a row
666	** notifying the user about the hidden rows.
667	*/
668	if( j<nContext \|\| j>c.aEdit[i]-nContext-1 ){
	@@ -703,11 +700,10 @@
700	int lim;
701	lim = c.aEdit[i+1] > c.aEdit[i+2] ? c.aEdit[i+1] : c.aEdit[i+2];
702
703	/* Assume changed lines */
704	for( j=0; j<lim; j++ ){

705	@ <tr>
706
707	if( j<c.aEdit[i+1] ){
708	copylimline(linebuf, &c.aFrom[iFrom+j], collim);
709	@ <td class="changed lineno">%d(iFrom+j+1)</td>
	@@ -732,37 +728,29 @@
728	iTo+=c.aEdit[i+2];
729	}else{
730
731	/* Process deleted lines */
732	for( j=0; j<c.aEdit[i+1]; j++ ){

733	@ <tr>
734
735	copylimline(linebuf, &c.aFrom[iFrom+j], collim);
736	@ <td class="removed lineno">%d(iFrom+j+1)</td>
737	@ <td class="removed srcline">%h(linebuf)</td>

738	@ <td><</td>

739	@ <td colspan="2" class="removedvoid"/>

740	@ </tr>
741	}
742	iFrom+=c.aEdit[i+1];
743
744	/* Process inserted lines */
745	for( j=0; j<c.aEdit[i+2]; j++ ){

746	@ <tr>
747	@ <td colspan="2" class="addedvoid"/>

748	@ <td>></td>

749	copylimline(linebuf, &c.aTo[iTo+j], collim);
750	@ <td class="added lineno">%d(iTo+j+1)</td>
751	@ <td class="added srcline">%h(linebuf)</td>

752	@ </tr>
753	}
754	iTo+=c.aEdit[i+2];
755	}
756
757

Fossil SCM

Keyboard Shortcuts