@matheusbsbs / matheus-bagliano / commits / a56eea28c4

remote: drop free_refspecs() function

We already have free_refspec(), a public function which does the same thing as the static free_refspecs(). Let's just keep one. There are two minor differences between the functions: 1. free_refspecs() is a noop when the refspec argument is NULL. This probably doesn't matter in practice. The nr_refspec parameter would presumably be 0 in that case, skipping the loop. And free(NULL) is explicitly OK. But it doesn't hurt for us to port this extra safety to free_refspec(), as one of the callers passes a funny "i+1" count. 2. The order of arguments is reversed between the two functions. This patch uses the already-public order of free_refspec(), as it matches the argument order on the parsing side. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed May 31, 2017 at 00:27 UTC a56eea28c45a8f76e4167c4e6baa87e89b7be3bc

1 file changed +6 -22

remote.c

+6 -22

@@ -477,26 +477,6 @@ static void read_config(void)

477 alias_all_urls();

478 }

479

480 -/*

481 - * This function frees a refspec array.

482 - * Warning: code paths should be checked to ensure that the src

483 - * and dst pointers are always freeable pointers as well

484 - * as the refspec pointer itself.

485 - */

486 -static void free_refspecs(struct refspec *refspec, int nr_refspec)

487 -{

488 - int i;

489 -

490 - if (!refspec)

491 - return;

492 -

493 - for (i = 0; i < nr_refspec; i++) {

494 - free(refspec[i].src);

495 - free(refspec[i].dst);

496 - }

497 - free(refspec);

498 -}

499 -

480 static struct refspec *parse_refspec_internal(int nr_refspec, const char **refspec, int fetch, int verify)

481 {

482 int i;

@@ -610,7 +590,7 @@ static struct refspec *parse_refspec_internal(int nr_refspec, const char **refsp

590 * since it is only possible to reach this point from within

591 * the for loop above.

592 */

613 - free_refspecs(rs, i+1);

593 + free_refspec(i+1, rs);

594 return NULL;

595 }

596 die("Invalid refspec '%s'", refspec[i]);

@@ -621,7 +601,7 @@ int valid_fetch_refspec(const char *fetch_refspec_str)

601 struct refspec *refspec;

602

603 refspec = parse_refspec_internal(1, &fetch_refspec_str, 1, 1);

624 - free_refspecs(refspec, 1);

604 + free_refspec(1, refspec);

605 return !!refspec;

606 }

607

@@ -638,6 +618,10 @@ struct refspec *parse_push_refspec(int nr_refspec, const char **refspec)

618 void free_refspec(int nr_refspec, struct refspec *refspec)

619 {

620 int i;

621 +

622 + if (!refspec)

623 + return;

624 +

625 for (i = 0; i < nr_refspec; i++) {

626 free(refspec[i].src);

627 free(refspec[i].dst);