From f46c4521d761a0b9909e17ef29065c0aa09c7ab7 Mon Sep 17 00:00:00 2001
From: June McEnroe <june@causal.agency>
Date: Tue, 8 Jun 2021 14:27:44 -0400
Subject: Squashed 'www/git.causal.agency/cgit/' changes from
 55fa25ad..5258c297

5258c297 git: update to v2.32.0
6dbbffe0 git: update to v2.31.1
62eb8db4 md2html: use proper formatting for hr
d889cae8 git: update to v2.31.0
4ffadc1e git: update to v2.30.1
bd6f5683 tests: t0107: support older and/or non-GNU tar
f69626c6 md2html: use sane_lists extension
cef27b67 git: update to v2.30.0
b1739247 git: update to v2.29.2
fe99c76e git: update to v2.29.1
adcc4f82 tests: try with commit-graph
a1039ab1 tests: do not copy snapshots to /tmp/
a4de0e81 global: replace hard coded hash length
779631c6 global: replace references to 'sha1' with 'oid'
629659d2 git: update to v2.29.0
205837d4 git: update to v2.28.0
f780396c git: update to v2.27.0
0462f08d git: update to v2.26.0

git-subtree-dir: www/git.causal.agency/cgit
git-subtree-split: 5258c297ba6fb604ae1415fbc19a3fe42457e49e
---
 ui-snapshot.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'ui-snapshot.c')

diff --git a/ui-snapshot.c b/ui-snapshot.c
index 556d3ed4..18361a65 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -13,32 +13,32 @@
 
 static int write_archive_type(const char *format, const char *hex, const char *prefix)
 {
-	struct argv_array argv = ARGV_ARRAY_INIT;
+	struct strvec argv = STRVEC_INIT;
 	const char **nargv;
 	int result;
-	argv_array_push(&argv, "snapshot");
-	argv_array_push(&argv, format);
+	strvec_push(&argv, "snapshot");
+	strvec_push(&argv, format);
 	if (prefix) {
 		struct strbuf buf = STRBUF_INIT;
 		strbuf_addstr(&buf, prefix);
 		strbuf_addch(&buf, '/');
-		argv_array_push(&argv, "--prefix");
-		argv_array_push(&argv, buf.buf);
+		strvec_push(&argv, "--prefix");
+		strvec_push(&argv, buf.buf);
 		strbuf_release(&buf);
 	}
-	argv_array_push(&argv, hex);
+	strvec_push(&argv, hex);
 	/*
 	 * Now we need to copy the pointers to arguments into a new
 	 * structure because write_archive will rearrange its arguments
 	 * which may result in duplicated/missing entries causing leaks
-	 * or double-frees in argv_array_clear.
+	 * or double-frees in strvec_clear.
 	 */
-	nargv = xmalloc(sizeof(char *) * (argv.argc + 1));
-	/* argv_array guarantees a trailing NULL entry. */
-	memcpy(nargv, argv.argv, sizeof(char *) * (argv.argc + 1));
+	nargv = xmalloc(sizeof(char *) * (argv.nr + 1));
+	/* strvec guarantees a trailing NULL entry. */
+	memcpy(nargv, argv.v, sizeof(char *) * (argv.nr + 1));
 
-	result = write_archive(argv.argc, nargv, NULL, the_repository, NULL, 0);
-	argv_array_clear(&argv);
+	result = write_archive(argv.nr, nargv, NULL, the_repository, NULL, 0);
+	strvec_clear(&argv);
 	free(nargv);
 	return result;
 }
-- 
cgit 1.4.1