Commit Diff

Commit:
ca1af2458002521a86c887db84fe24ccc7002ab9
From:
Neels Hofmeyr <neels@hofmeyr.de>
Date:
Message:
cosmetic: rename local var from 'r' to 'rc'
Actions:
Patch | Tree
commit - f5a254cc6ed65ef2e4fcb0737f4e3730f1a63f92
commit + ca1af2458002521a86c887db84fe24ccc7002ab9
blob - 2636b53c98137886a67fa7e9eaf34d32e205498f
blob + b4bc55624fc324a63bf6681bae9308ac681124ad
--- lib/diff_patience.c
+++ lib/diff_patience.c
@@ -386,11 +386,11 @@ diff_atoms_swallow_identical_neighbors(struct diff_dat
 		     identical_l.start > l_min && identical_r.start > r_min;
 		     identical_l.start--, identical_r.start--) {
 			bool same;
-			int r = diff_atom_same(&same,
+			int rc = diff_atom_same(&same,
 				&left->atoms.head[identical_l.start - 1],
 				&right->atoms.head[identical_r.start - 1]);
-			if (r)
-				return r;
+			if (rc)
+				return rc;
 			if (!same)
 				break;
 		}
@@ -404,11 +404,11 @@ diff_atoms_swallow_identical_neighbors(struct diff_dat
 			struct diff_atom *l_end;
 			struct diff_atom *r_end;
 			bool same;
-			int r = diff_atom_same(&same,
+			int rc = diff_atom_same(&same,
 					&left->atoms.head[identical_l.end],
 					&right->atoms.head[identical_r.end]);
-			if (r)
-				return r;
+			if (rc)
+				return rc;
 			if (!same)
 				break;
 			l_end = &left->atoms.head[identical_l.end];