remote: convert match_explicit_refs to take a struct refspec

bmwill · gitster · commit 9fa2e5e85345 · 2018-05-18T06:19:44.000+09:00
Convert 'match_explicit_refs()' to take a 'struct refspec' as a
parameter instead of a list of 'struct refspec_item'.

Signed-off-by: Brandon Williams &lt;bmwill@google.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/remote.c b/remote.c
@@ -1073,12 +1073,11 @@ static int match_explicit(struct ref *src, struct ref *dst,
 }
 
 static int match_explicit_refs(struct ref *src, struct ref *dst,
-			       struct ref ***dst_tail, struct refspec_item *rs,
-			       int rs_nr)
+			       struct ref ***dst_tail, struct refspec *rs)
 {
 	int i, errs;
-	for (i = errs = 0; i < rs_nr; i++)
-		errs += match_explicit(src, dst, dst_tail, &rs[i]);
+	for (i = errs = 0; i < rs->nr; i++)
+		errs += match_explicit(src, dst, dst_tail, &rs->items[i]);
 	return errs;
 }
 
@@ -1302,7 +1301,7 @@ int match_push_refs(struct ref *src, struct ref **dst,
 		refspec = default_refspec;
 	}
 	refspec_appendn(&rs, refspec, nr_refspec);
-	errs = match_explicit_refs(src, *dst, &dst_tail, rs.items, rs.nr);
+	errs = match_explicit_refs(src, *dst, &dst_tail, &rs);
 
 	/* pick the remainder */
 	for (ref = src; ref; ref = ref->next) {

Original file line number	Diff line number	Diff line change
`@@ -1073,12 +1073,11 @@ static int match_explicit(struct ref src, struct ref dst,`
`1073`	`1073`	`}`
`1074`	`1074`
`1075`	`1075`	`static int match_explicit_refs(struct ref src, struct ref dst,`
`1076`		`- struct ref **dst_tail, struct refspec_item rs,`
`1077`		`- int rs_nr)`
	`1076`	`+ struct ref **dst_tail, struct refspec rs)`
`1078`	`1077`	`{`
`1079`	`1078`	`int i, errs;`
`1080`		`- for (i = errs = 0; i < rs_nr; i++)`
`1081`		`- errs += match_explicit(src, dst, dst_tail, &rs[i]);`
	`1079`	`+ for (i = errs = 0; i < rs->nr; i++)`
	`1080`	`+ errs += match_explicit(src, dst, dst_tail, &rs->items[i]);`
`1082`	`1081`	`return errs;`
`1083`	`1082`	`}`
`1084`	`1083`
`@@ -1302,7 +1301,7 @@ int match_push_refs(struct ref src, struct ref *dst,`
`1302`	`1301`	`refspec = default_refspec;`
`1303`	`1302`	`}`
`1304`	`1303`	`refspec_appendn(&rs, refspec, nr_refspec);`
`1305`		`- errs = match_explicit_refs(src, *dst, &dst_tail, rs.items, rs.nr);`
	`1304`	`+ errs = match_explicit_refs(src, *dst, &dst_tail, &rs);`
`1306`	`1305`
`1307`	`1306`	`/* pick the remainder */`
`1308`	`1307`	`for (ref = src; ref; ref = ref->next) {`